notify fixes

diff --git a/css/tt-rss.css b/css/tt-rss.css
index ca0284a662f5dcc4ca7d28ea99585139a67d12f0..48f02f924df8fc9d0961500750d9d0aba241046f 100644 (file)
--- a/css/tt-rss.css
+++ b/css/tt-rss.css
@@ -148,11 +148,6 @@ a:hover {
        -webkit-transform: translate(0, -35px);
    -o-transform: translate(0, -35px);
    -moz-transform: translate(0, -35px);
-
-       transition: all 0.5s ease-in-out;
-       -webkit-transition: all 0.5s ease-in-out;
-   -moz-transition: all 0.5s ease-in-out;
-   -o-transition: all 0.5s ease-in-out;
 }
 
 #notify {
@@ -167,6 +162,11 @@ a:hover {
        z-index : 99;
        padding : 5px;
        box-shadow : 0px -2px 2px rgba(0,0,0,0.1);
+
+       transition: all 0.5s ease-in-out;
+       -webkit-transition: all 0.5s ease-in-out;
+   -moz-transition: all 0.5s ease-in-out;
+   -o-transition: all 0.5s ease-in-out;
 }
 
 #notify img {

diff --git a/js/functions.js b/js/functions.js
index 720a5654a95d73e4f8d15af0ed09817088499f47..98a531851683b241f26a88db56880cef2b45bf92 100644 (file)
--- a/js/functions.js
+++ b/js/functions.js
@@ -212,30 +212,39 @@ function notify_real(msg, no_hide, n_type) {
        msg = "<span class=\"msg\"> " + __(msg) + "</span>";
 
        if (n_type == 2) {
-               n.className = "notify notify_progress visible";
                msg = "<span><img src='images/indicator_white.gif'></span>" + msg;
                no_hide = true;
        } else if (n_type == 3) {
-               n.className = "notify notify_error visible";
                msg = "<span><img src='images/alert.png'></span>" + msg;
        } else if (n_type == 4) {
-               n.className = "notify notify_info visible";
                msg = "<span><img src='images/information.png'></span>" + msg;
-       } else {
-               n.className = "notify visible";
        }
 
        msg += " <span><img src=\"images/cross.png\" class=\"close\" title=\"" +
                __("Click to close") + "\" onclick=\"notify('')\"></span>";
 
-//     msg = "<img src='images/live_com_loading.gif'> " + msg;
-
        n.innerHTML = msg;
 
-       if (!no_hide) {
-               notify_hide_timerid = window.setTimeout(function() {
+       window.setTimeout(function() {
+               // goddamnit firefox
+               if (n_type == 2) {
+               n.className = "notify notify_progress visible";
+                       } else if (n_type == 3) {
+                       n.className = "notify notify_error visible";
+                       msg = "<span><img src='images/alert.png'></span>" + msg;
+               } else if (n_type == 4) {
+                       n.className = "notify notify_info visible";
+               } else {
+                       n.className = "notify visible";
+               }
+
+               if (!no_hide) {
+                       notify_hide_timerid = window.setTimeout(function() {
                                n.removeClassName("visible") }, 5*1000);
-       }
+               }
+
+       }, 10);
+
 }
 
 function notify(msg, no_hide) {