From: Chris Porter <redacted>
Date: Tue, 21 Oct 2008 09:56:27 +0000 (+0100)
Subject: Fix nicklist order bug.
X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/commitdiff_plain/833f14cebf7e2fccf9546a0900a66c90302d413a

Fix nicklist order bug.
---

diff --git a/TODO.txt b/TODO.txt
index 0411060..5c7e7de 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,4 +5,3 @@ tab completion
 options for notices and stuff
 @+ in nick shown in text
 scroll pos isn't saved when you go between tabs if not at bottom.
-
diff --git a/js/ui/baseuiwindow.js b/js/ui/baseuiwindow.js
index 62e5475..4a9d06b 100644
--- 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) {