Changeset 156

Timestamp:

04/24/07 10:15:03 (19 months ago)

Author:

kaz

Message:

Refs #22

• fix scrollbar behavior

Location:

trunk/twitternotifier

Files:

• components/nsTwitterNotifier.js (modified) (2 diffs)
• content/twitternotifier.js (modified) (4 diffs)
• content/twitternotifier.xml (modified) (2 diffs)

trunk/twitternotifier/components/nsTwitterNotifier.js

@@ -363 +363 @@
     this._interval = pref.getIntPref("extensions.twitternotifier.interval") * 60 * 1000;
 
+    //this.statuses_friends_timeline(gTestData);
     this.get("statuses.friends_timeline");
   },
@@ -452 +453 @@
       this._messages.splice(50);
 
-      msgs.splice(5);
-      this.notifyStatus("friendsTimeline", msgs.reverse());
+      this.notifyStatus("friendsTimeline", msgs);
 
     }

trunk/twitternotifier/content/twitternotifier.js

@@ -119 +119 @@
       this.setButtonState("active");
       var l = content.location.toString();
+
+      // Dont show popup when user opens twitter.
       if (!l.match(/TWITTER_TOP_URL/)) {
-        this._messageQueue = msg.data;
+        if (!this._isShowPopup) {
+          msg.data.splice(5);
+        }
+        this._messageQueue = msg.data.reverse();
         this.updateBalloon();
       }
@@ -292 +297 @@
       this._container.appendChild(box);
       this.showUnreadCount(this._messageQueue.length);
-      this._timer = setTimeout("gTwitterNotifier.onTimeoutBalloon()", 2500);
+      this._timer = setTimeout("gTwitterNotifier.onTimeoutBalloon()", 3000);
     }
   },
@@ -397 +402 @@
   },
 
-  onDragMove: function(event) {
+  onDragMove: function(e) {
     if (this._dragging) {
-      var pos = event.target.getAttribute("curpos");
+      var pos = e.target.getAttribute("curpos");
       this.getScrollBoxObject().scrollTo(0, pos * 10);
     }
   },
 
-  onDragStart: function (event, transferData, action) {
-    if (event.target.tagName == "xul:thumb") {
+  onScrollbarClick: function(e) {
+      var pos = e.target.getAttribute("curpos");
+      this.getScrollBoxObject().scrollTo(0, pos * 10);
+ },
+
+  onDragStart: function (e) {
+    if (e.target.tagName == "xul:thumb") {
       this._dragging = true;
     }
   },
 
-  onDragExit: function(event) {
+  onDragExit: function(e) {
     this._dragging = false;
   },
@@ -418 +428 @@
     var box = this.getScrollBoxObject();
 
-    box.scrollBy(0, this._scrollStep * e.detail);
+    //box.scrollBy(0, this._scrollStep * e.detail);
+    box.scrollBy(0, 32 * e.detail);
     var popup = this._container.firstChild;
     var curpos = popup.getAttribute("curpos");

trunk/twitternotifier/content/twitternotifier.xml

@@ -4 +4 @@
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script src="chrome://global/content/nsDragAndDrop.js"/>
-  <script src="chrome://global/content/nsTransferable.js"/> 
 
   <binding id="twitternotifier-status">
@@ -50 +47 @@
                     orient="vertical"
                     sborient="vertical"
-                    ondraggesture="nsDragAndDrop.startDrag(event, gTwitterNotifier)"
+                    pageincrement="10"
+                    onclick="gTwitterNotifier.onScrollbarClick(event)"
+                    ondraggesture="gTwitterNotifier.onDragStart(event)"
                     onmousemove="gTwitterNotifier.onDragMove(event);"
                     onmouseup="gTwitterNotifier.onDragExit(event);"