Fix nicklist order bug.

diff --git a/TODO.txt b/TODO.txt
index 041106062ae1f99ee6e2a7ac9deeaf6bf06f1100..5c7e7de938f7b9bca59349a0a9300f150ddf6eed 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,4 +5,3 @@ tab completion
 options for notices and stuff\r
 @+ in nick shown in text\r
 scroll pos isn't saved when you go between tabs if not at bottom.\r
-\r

diff --git a/js/ui/baseuiwindow.js b/js/ui/baseuiwindow.js
index 62e54750f5cccf7b3c83cc1b186e96fb6bb6c076..4a9d06b6939e4f0fa25c61c9b4f340ecffe178e6 100644 (file)
--- a/js/ui/baseuiwindow.js
+++ b/js/ui/baseuiwindow.js
@@ -130,10 +130,17 @@ qwebirc.ui.Window = new Class({
     }
   },
   updateNickList: function(nicks) {
-    var nickHash = {};
+    var nickHash = {}, present = {};
     var added = [];
     var lnh = this.lastNickHash;
     
+    for(var i=0;i<nicks.length;i++)
+      present[nicks[i]] = 1;
+    
+    for(var k in lnh)
+      if(!present[k])
+        this.nickListRemove(k, lnh[k]);
+        
     for(var i=0;i<nicks.length;i++) {
       var n = nicks[i];
       var l = lnh[n];
@@ -145,10 +152,6 @@ qwebirc.ui.Window = new Class({
       nickHash[n] = l;
     }
     
-    for(var k in lnh)
-      if(!nickHash[k])
-        this.nickListRemove(k, lnh[k]);
-        
     this.lastNickHash = nickHash;
   },
   nickListAdd: function(position, nick) {