msie-related code cleanup

diff --git a/functions.js b/functions.js
index 79068c0fd8340f33317d214a2c71ae8c81e41f97..a5c689b1026d9f059bd765460f25f5a708e68e47 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -11,10 +11,6 @@ Array.prototype.remove = function(s) {
        }
 }
 
-function is_msie() {
-       return navigator.userAgent.match("MSIE");
-}
-
 function is_opera() {
        return window.opera;
 }
@@ -28,7 +24,9 @@ function exception_error(location, e, silent) {
                msg = "Exception: " + e.name + ", " + e.message + 
                        "\nFunction: " + location + "()" +
                        "\nLocation: " + base_fname + ":" + e.lineNumber;
-               
+
+       } else if (e.description) {
+               msg = "Exception: " + e.description + "\nFunction: " + location + "()";
        } else {
                msg = "Exception: " + e + "\nFunction: " + location + "()";
        }
@@ -534,7 +532,7 @@ function parse_counters(reply, scheduled_call) {
                                }
                        }
 
-                       if (has_img && feed_img && !is_msie()) {
+                       if (has_img && feed_img) {
                                if (!feed_img.src.match(id + ".ico")) {
                                        feed_img.src = getInitParam("icons_location") + "/" + id + ".ico";
                                }

diff --git a/ie6.css b/ie6.css
deleted file mode 100644 (file)
index 0a1aa43..0000000
--- a/ie6.css
+++ /dev/null
@@ -1,21 +0,0 @@
-#infoBoxTitle {
-       display : none;
-}
-
-#headlinesContainer {
-       width: expression(((parseInt(document.getElementById("headlines-frame").clientWidth)-2)+'px'));
-}
-
-#headlinesInnerContainer {
-       position : normal;
-}
-
-div.headlines_normal {
-       overflow : auto;
-}
-
-div.headlines_cdm {
-       overflow : auto;
-}
-
-

diff --git a/ie7.css b/ie7.css
deleted file mode 100644 (file)
index 96fd6f4..0000000
--- a/ie7.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* div.prefsTabSelected {
-       bottom : 1px;
-} */
-
-table.headlinesList {
-       width: expression(((parseInt(document.getElementById("headlinesInnerContainer").clientWidth)-0)+'px'));
-}
-

diff --git a/prefs.php b/prefs.php
index 76da060485ece2c9828539920772c2af3d4d1600..b75a8b05f8e3c4434c6aa2cc6ae0426831a086e1 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -46,15 +46,6 @@
        <script type="text/javascript" src="functions.js?<?php echo $dt_add ?>"></script>
        <script type="text/javascript" src="prefs.js?<?php echo $dt_add ?>"></script>
 
-       <!--[if lt IE 7]>
-               <script type="text/javascript" src="pngfix.js"></script>
-               <link rel="stylesheet" type="text/css" href="ie6.css">
-       <![endif]-->
-
-       <!--[if IE 7]>          
-               <link rel="stylesheet" type="text/css" href="ie7.css">
-       <![endif]-->
-
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
        <script type="text/javascript">

diff --git a/tt-rss.js b/tt-rss.js
index 4e0d2a22986359d980bd6ed39bf13e56600ba321..d27a94af62db56d98456c01fec7263342df1b6a7 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -383,7 +383,7 @@ function resize_headlines(delta_x, delta_y) {
                        }
                }
 
-               debug("resize_headlines: HOR-mode");
+               debug("resize_headlines: HOR-mode: " + hor_offset);
 
                c_frame.style.width = (400 + hor_offset) + "px";
                h_frame.style.right = c_frame.offsetWidth - 1 + "px";
@@ -401,37 +401,20 @@ function resize_headlines(delta_x, delta_y) {
                        }
                }
 
-               debug("resize_headlines: VER-mode");
+               debug("resize_headlines: VER-mode: " + ver_offset);
 
-               if (!is_msie()) {
-                       h_frame.style.height = (300 - ver_offset) + "px";
+               h_frame.style.height = (300 - ver_offset) + "px";
 
-                       c_frame.style.top = (h_frame.offsetTop + h_frame.offsetHeight + 1) + "px";
-                       h_frame.style.height = h_frame.offsetHeight + "px";
+               c_frame.style.top = (h_frame.offsetTop + h_frame.offsetHeight + 1) + "px";
+               h_frame.style.height = h_frame.offsetHeight + "px";
 
-                       var theme_c = 0;
+               var theme_c = 0;
 
-                       if (getInitParam("theme") == "graycube") theme_c = 1;
+               if (getInitParam("theme") == "graycube") theme_c = 1;
 
-                       resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 
-                               4 - theme_c) + "px";
-                       resize_grab.style.display = "block";
-
-               } else {
-                       h_frame.style.height = document.documentElement.clientHeight * 0.3 + "px";
-                       c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
-       
-                       var c_bottom = document.documentElement.clientHeight;
-       
-                       if (f_frame) {
-                               c_bottom = f_frame.offsetTop;
-                       }
-       
-                       c_frame.style.height = c_bottom - (h_frame.offsetTop + 
-                               h_frame.offsetHeight + 1) + "px";
-                       h_frame.style.height = h_frame.offsetHeight + "px";
-
-               }
+               resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 
+                       4 - theme_c) + "px";
+               resize_grab.style.display = "block";
 
        }
 
@@ -472,6 +455,11 @@ function init_second_stage() {
                ver_offset = parseInt(getCookie("ttrss_offset_ver"));
                hor_offset = parseInt(getCookie("ttrss_offset_hor"));
 
+               /* fuck IE */
+
+               if (isNaN(hor_offset)) hor_offset = 0;
+               if (isNaN(ver_offset)) ver_offset = 0;
+
                debug("offsets from cookies [x:y]: " + hor_offset + ":" + ver_offset);
 
                resize_headlines();

diff --git a/tt-rss.php b/tt-rss.php
index 8fa81120850f37fe528ef365731c7ae371b7a5e4..74e84bea5ffcad94347e55d2ae789a5b1bd0bae0 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -37,15 +37,6 @@
                <link rel="stylesheet" type="text/css" href="<?php echo $user_css_url ?>"/> 
        <?php } ?>
 
-       <!--[if lt IE 7]>               
-               <script type="text/javascript" src="pngfix.js"></script>
-               <link rel="stylesheet" type="text/css" href="ie6.css">
-       <![endif]-->
-
-       <!--[if IE 7]>          
-               <link rel="stylesheet" type="text/css" href="ie7.css">
-       <![endif]-->
-
        <link rel="shortcut icon" type="image/png" href="images/favicon.png">
 
        <script type="text/javascript" src="prototype.js"></script>