Re-clicking a nick will now collapse the userbox

[KiwiIRC.git] / js / front.js

diff --git a/js/front.js b/js/front.js
index 1b8eae166d9cf7099b003a15463db4b189aec286..6b48ecc0d33875c914312e9ff63b6031d17ed350 100644 (file)
--- a/js/front.js
+++ b/js/front.js
@@ -959,27 +959,27 @@ var front = {
     
     
     userClick: function (item) {
+        var li = $(item).parent();
+
         // Remove any existing userboxes
         $('#kiwi .userbox').remove();
-        
-        var li = $(item).parent();
-        /*var html = '<div class="userbox">\
-    <input type="hidden" class="userbox_nick" value="' + front.nickStripPrefix($(item).text()) + '" />\
-    <a href="#" class="userbox_query">Message</a>\
-    <a href="#" class="userbox_whois">Info</a>\
-</div>';
-        li.append(html);*/
-        $('#tmpl_user_box').tmpl({nick: front.nickStripPrefix($(item).text())}).appendTo(li);
-        
-        $('#kiwi .userbox .userbox_query').click(function (ev) {
-            var nick = $('#kiwi .userbox_nick').val();
-            front.run('/query ' + nick);
-        });
-        
-        $('#kiwi .userbox .userbox_whois').click(function (ev) {
-            var nick = $('#kiwi .userbox_nick').val();
-            front.run('/whois ' + nick);
-        });
+
+        if ($(li).data('userbox') === item) {
+            $(li).removeData('userbox');
+        } else {
+            $('#tmpl_user_box').tmpl({nick: front.nickStripPrefix($(item).text())}).appendTo(li);
+            
+            $('#kiwi .userbox .userbox_query').click(function (ev) {
+                var nick = $('#kiwi .userbox_nick').val();
+                front.run('/query ' + nick);
+            });
+            
+            $('#kiwi .userbox .userbox_whois').click(function (ev) {
+                var nick = $('#kiwi .userbox_nick').val();
+                front.run('/whois ' + nick);
+            });
+            $(li).data('userbox', item);
+        }
     },
     
     
@@ -1158,7 +1158,7 @@ var Utilityview = function (name, src) {
 
     if (!front.tabviewExists(name)) {
         $('#kiwi .windows .scroller').append('<div id="' + tmp_divname + '" class="messages"></div>');
-        $('#kiwi .windowlist ul').append('<li id="' + tmp_tabname + '" onclick="front.tabviews[\'' + name.toLowerCase() + '\'].show();">' + name + '</li>');
+        $('#kiwi .utilityviewlist ul').append('<li id="' + tmp_tabname + '" onclick="front.tabviews[\'' + name.toLowerCase() + '\'].show();">' + name + '</li>');
     }
     
     this.div = $('#' + tmp_divname);
@@ -1181,10 +1181,10 @@ Utilityview.prototype.topic = ' ';
 Utilityview.prototype.show = function () {
     $('#kiwi .messages').removeClass("active");
     $('#kiwi .userlist ul').removeClass("active");
-    $('#kiwi .windowlist ul li').removeClass("active");
+    $('#kiwi .toolbars ul li').removeClass("active");
 
     $('#windows').css('overflow-y', 'hidden');
-
+    $('#windows').css('right', 0);
     // Activate this tab!
     this.div.addClass('active');
     this.tab.addClass('active');
@@ -1229,7 +1229,7 @@ Utilityview.prototype.addPartImage = function () {
 };
 
 Utilityview.prototype.clearPartImage = function () {
-    $('#kiwi .windowlist .tab_part').remove();
+    $('#kiwi .toolbars .tab_part').remove();
 };
 
 
@@ -1257,7 +1257,7 @@ Tabview.prototype.show = function () {
 
     $('#kiwi .messages').removeClass("active");
     $('#kiwi .userlist ul').removeClass("active");
-    $('#kiwi .windowlist ul li').removeClass("active");
+    $('#kiwi .toolbars ul li').removeClass("active");
     
     w = $('#windows');
     u = $('#kiwi .userlist');
@@ -1330,7 +1330,7 @@ Tabview.prototype.addPartImage = function () {
 };
 
 Tabview.prototype.clearPartImage = function () {
-    $('#kiwi .windowlist .tab_part').remove();
+    $('#kiwi .toolbars .tab_part').remove();
 };
 
 Tabview.prototype.addMsg = function (time, nick, msg, type, style) {