Changeset e11e2c

Timestamp:

Aug 20, 2008, 6:37:22 PM (12 years ago)

Author:

rene <rene@…>

Branches:

master

Children:

49dcdd

Parents:

a26656

Message:

changed and repaired for seamonkey 1.11.1

Location:

chrome/content/v_identity

Files:

• vI_notificationBar.js (modified) (6 diffs)
• vI_notificationBar.xml (modified) (1 diff)

chrome/content/v_identity/vI_notificationBar.js

@@ -97 +97 @@
     clear : function() {
         if (!vI_notificationBar.Obj_vINotification) return;
-        // workaround, seems that my usage of notificationbox doesn't display multiple lines
-        vI_notificationBar.Obj_vINotification.height = 0;
+        if (vI_notificationBar.timer) window.clearTimeout(vI_notificationBar.timer);
+        vI_notificationBar.timer = null;
         vI_notificationBar.Obj_vINotification.removeAllNotifications(false);
     },
@@ -172 +172 @@
     },
     
-    hide : function() {
-        vI_notificationBar.timer = null;
-        vI_notificationBar.clear()
-    },
-    
     setNote: function(note, prefstring, title) {
         vI_notificationBar.clear();
@@ -185 +180 @@
         // height will be cut off from messagepane (in 3pane window)
         var objMessagepane = document.getElementById("messagepane");
-        var maxHeight = 1000;
-        if (objMessagepane) maxHeight = parseInt(objMessagepane.boxObject.height / 2) +1
-        var tooBig = (elem.inputField.scrollHeight > maxHeight)
-        var newHeight = (tooBig)?maxHeight:elem.inputField.scrollHeight
+        var maxHeight = (objMessagepane)?parseInt(objMessagepane.boxObject.height / 2)+1:null;
+        var tooBig = (maxHeight)?(elem.inputField.scrollHeight > maxHeight):false;
+        var newHeight = (tooBig)?maxHeight:elem.inputField.scrollHeight;
         elem.height = newHeight;
-        vI_notificationBar.Obj_vINotification.height = newHeight + 24; // a little bigger
-        // give the box a frame if it is to bigger
+        // give the box a frame if it is to big
         if (tooBig) document.getElementById("vINotificationTextbox").setAttribute("class", "plain border")
     },
@@ -198 +191 @@
         if (!title) return;
         vI_notificationBar.dump("** setTitle: " + title + "\n");
-        var Obj_vvINotificationTitle = document.getElementById("vINotificationTitle");
-        Obj_vvINotificationTitle.setAttribute("value", title);
-        Obj_vvINotificationTitle.removeAttribute("hidden");
+        var Obj_vINotificationTitle = document.getElementById("vINotificationTitle");
+        Obj_vINotificationTitle.setAttribute("value", title);
+        Obj_vINotificationTitle.removeAttribute("hidden");
     },
 
@@ -209 +202 @@
         if (!vI_notificationBar.Obj_vINotification) return;
         if (!vI_notificationBar.versionOk) return;
-        if (vI_notificationBar.timer) window.clearTimeout(vI_notificationBar.timer);
         var oldNotification = vI_notificationBar.Obj_vINotification.currentNotification
         var newLabel = (oldNotification)?oldNotification.label + note:note;
@@ -218 +210 @@
 
         if (vI_notificationBar.preferences.getIntPref("notification_timeout") != 0)
-            vI_notificationBar.timer = window.setTimeout(vI_notificationBar.hide,
+            vI_notificationBar.timer = window.setTimeout(vI_notificationBar.clear,
                 vI_notificationBar.preferences.getIntPref("notification_timeout") * 1000);
     },

chrome/content/v_identity/vI_notificationBar.xml

@@ -41 +41 @@
       <field name="_blockingCanvas">null</field>
 
+      
+      <property name="height"
+        onget="return this.height;">
+      </property>
+      
       <property name="notificationsHidden"
                 onget="return this.getAttribute('notificationshidden') == 'true';">