diff options
| author | Andrew Dolgov <[email protected]> | 2009-12-24 12:20:01 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2009-12-24 12:20:01 +0300 |
| commit | 44258fa967a8804a80d84ebd845a8668c18ca890 (patch) | |
| tree | d1a40d64bcd51050804c5ff3f0e1f879d531108e | |
| parent | 87dd6451fc72643cd25786b26ae53bed9d58d92f (diff) | |
remove obsolete methods to call init(); code cleanup
| -rw-r--r-- | opera.css | 27 | ||||
| -rw-r--r-- | prefs.js | 3 | ||||
| -rw-r--r-- | prefs.php | 37 | ||||
| -rw-r--r-- | tt-rss.js | 6 | ||||
| -rw-r--r-- | tt-rss.php | 38 |
5 files changed, 9 insertions, 102 deletions
diff --git a/opera.css b/opera.css deleted file mode 100644 index 27e748dc2..000000000 --- a/opera.css +++ /dev/null @@ -1,27 +0,0 @@ -table.main td.headlines { - height : 35%; - border-width : 0px 0px 1px 1px; - border-style : solid; - border-color : #c0c0c0; -} - -/* #infoBoxShadow { - background-image : url("images/overlay.png"); - left : 0; - top : 0; - height : 100%; - width : 100%; - z-index : 3; - position : absolute; - display : none; -} - -#infoBox { - font-size : small; - position : relative; - top : 30%; - left : 30%; - width : 30%; - padding-bottom : 5px; -} */ - @@ -1217,9 +1217,6 @@ function init() { try { - if (arguments.callee.done) return; - arguments.callee.done = true; - if (getURLParam('debug')) { Element.show("debug_output"); debug('debug mode activated'); @@ -49,14 +49,13 @@ <script type="text/javascript" charset="utf-8" src="prefs.js?<?php echo $dt_add ?>"></script> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - + <script type="text/javascript"> - //<![CDATA[ - if (navigator.userAgent.match("Opera")) { - document.write('<link rel="stylesheet" type="text/css" href="opera.css">'); - } - //]]> + Event.observe(window, 'load', function() { + init(); + }); </script> + </head> <body id="ttrssPrefs"> @@ -85,13 +84,6 @@ <img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/> -<script type="text/javascript"> -if (document.addEventListener) { - document.addEventListener("DOMContentLoaded", init, null); -} -window.onload = init; -</script> - <ul id="debug_output" style='display : none'><li> </li></ul> <div id="prefHeader"> @@ -108,10 +100,6 @@ window.onload = init; </div> <div id="prefTabs"> - <!-- <div class="return"> - <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a> - </div> --> - <div class='prefKbdHelp'> <img src="images/small_question.png" alt="?"/> <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a> </div> @@ -179,20 +167,5 @@ window.onload = init; <?php db_close($link); ?> -<script type="text/javascript"> - /* for IE */ - function statechange() { - if (document.readyState == "interactive") init(); - } - - if (document.readyState) { - if (document.readyState == "interactive" || document.readyState == "complete") { - init(); - } else { - document.onreadystatechange = statechange; - } - } -</script> - </body> </html> @@ -385,11 +385,6 @@ function init() { try { - // this whole shebang is based on http://www.birnamdesigns.com/misc/busted2.html - - if (arguments.callee.done) return; - arguments.callee.done = true; - init_gears(); disableContainerChildren("headlinesToolbar", true); @@ -512,6 +507,7 @@ function init_second_stage() { delCookie("ttrss_vf_test"); // document.onresize = resize_headlines; + window.onresize=resize_headlines; var toolbar = document.forms["main_toolbar_form"]; diff --git a/tt-rss.php b/tt-rss.php index 9caa666dd..fd3c88d4e 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -51,16 +51,12 @@ <script type="text/javascript" charset="utf-8" src="offline.js?<?php echo $dt_add ?>"></script> <script type="text/javascript" src="gears_init.js"></script> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <script type="text/javascript"> - //<![CDATA[ - if (navigator.userAgent.match("Opera")) { - document.write('<link rel="stylesheet" type="text/css" href="opera.css">'); - } - window.onresize=resize_headlines; - //]]> + Event.observe(window, 'load', function() { + init(); + }); </script> </head> @@ -93,13 +89,6 @@ <div id="dialog_overlay" style="display : none"> </div> -<script type="text/javascript"> -if (document.addEventListener) { - document.addEventListener("DOMContentLoaded", init, null); -} -window.onload = init; -</script> - <ul id="debug_output" style='display : none'><li> </li></ul> <div id="infoBoxShadow" style="display : none"><div id="infoBox"> </div></div> @@ -285,12 +274,6 @@ window.onload = init; </form> - <!-- <input class="button" type="submit" - onclick="quickMenuGo('qmcSearch')" value="Search (tmp)"> --> - - <!-- <input class="button" type="submit" - onclick="catchupCurrentFeed()" value="Mark as read"> --> - </div> <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?> @@ -331,20 +314,5 @@ window.onload = init; <?php db_close($link); ?> -<script type="text/javascript"> - /* for IE */ - function statechange() { - if (document.readyState == "interactive") init(); - } - - if (document.readyState) { - if (document.readyState == "interactive" || document.readyState == "complete") { - init(); - } else { - document.onreadystatechange = statechange; - } - } -</script> - </body> </html> |