Tidying, all.js parsing with uglify-js fix, nickchange event fix

diff --git a/js/front.events.js b/js/front.events.js
index 222ef9f6d053aec136849681b292a7265f8570bf..a6aecd6b033e43b79d8774c9c5e6e492fc6f1a93 100644 (file)
--- a/js/front.events.js
+++ b/js/front.events.js
@@ -369,7 +369,7 @@ kiwi.front.events = {
     onNick: function (e, data) {\r
         if (data.nick === kiwi.gateway.nick) {\r
             kiwi.gateway.nick = data.newnick;\r
-            kiwi.front.doLayout();\r
+            kiwi.front.ui.doLayout();\r
         }\r
 \r
         _.each(Tabview.getAllTabs(), function (tab) {\r
@@ -473,7 +473,7 @@ kiwi.front.events = {
         }\r
 \r
         kiwi.front.doLayout();\r
-    },\r
+    }\r
 \r
 \r
-}
\ No newline at end of file
+};
\ No newline at end of file

diff --git a/js/front.js b/js/front.js
index 09e8aa90d2cbff0795645c4df688118f628d8a24..2ed278c1157f6d3b6a3f262a39c252645b9e9901 100644 (file)
--- a/js/front.js
+++ b/js/front.js
@@ -7,12 +7,11 @@ kiwi.front = {
     utilityviews: {},
     boxes: {},
 
-    buffer: [],
-    buffer_pos: 0,
+    buffer: [],         // Command history
+    buffer_pos: 0,      // Current command history position
 
-    cache: {},
-
-    original_topic: '',
+    // Container for misc data (eg. userlist generation)
+    cache: {original_topic: '', userlist: {}},
 
     init: function () {
         /*global Box, touch_scroll:true, Tabview */
@@ -23,8 +22,6 @@ kiwi.front = {
         // Bind to the gateway events
         kiwi.front.events.bindAll();
 
-        this.buffer = [];
-
         // Build the about box
         kiwi.front.boxes.about = new Box("about");
         about_info = 'UI adapted for ' + agent;
@@ -48,6 +45,10 @@ kiwi.front = {
 
         kiwi.front.ui.registerKeys();
 
+        window.onbeforeunload = function() {
+            return "Are you sure you leave Kiwi IRC?";
+        }
+
         $('#kiwi .toolbars').resize(kiwi.front.ui.doLayoutSize);
         $(window).resize(kiwi.front.ui.doLayoutSize);
 
@@ -141,7 +142,7 @@ kiwi.front = {
             } else if (e.which === 27) {
                 // escape
                 e.preventDefault();
-                $(this).text(kiwi.front.original_topic);
+                $(this).text(kiwi.front.cache.original_topic);
                 $('#kiwi_msginput').focus();
             }
         });
@@ -154,13 +155,13 @@ kiwi.front = {
             } else if (e.keyCode === 27) {
                 // escape
                 e.preventDefault();
-                $(this).text(kiwi.front.original_topic);
+                $(this).text(kiwi.front.cache.original_topic);
             }
         });*/
         $('.cur_topic').live('change', function () {
             var chan, text;
             text = $(this).text();
-            if (text !== kiwi.front.original_topic) {
+            if (text !== kiwi.front.cache.original_topic) {
                 chan = Tabview.getCurrentTab().name;
                 kiwi.gateway.setTopic(chan, text);
             }
@@ -373,6 +374,7 @@ kiwi.front = {
             default:
                 //Tabview.getCurrentTab().addMsg(null, ' ', '--> Invalid command: '+parts[0].substring(1));
                 kiwi.gateway.raw(msg.substring(1));
+                break;
             }
 
         } else {

diff --git a/js/front.ui.js b/js/front.ui.js
index b522e47c8da8d68750911fad148d2a57f0f6d630..1906d84b7b6af05ac63208c4a1561037287ff2f4 100644 (file)
--- a/js/front.ui.js
+++ b/js/front.ui.js
@@ -278,7 +278,7 @@ kiwi.front.ui = {
 \r
 \r
     setTopicText: function (new_topic) {\r
-        kiwi.front.original_topic = new_topic;\r
+        kiwi.front.cache.original_topic = new_topic;\r
         $('#kiwi .cur_topic .topic').text(new_topic);\r
         kiwi.front.ui.doLayoutSize();\r
     },\r
@@ -356,6 +356,6 @@ kiwi.front.ui = {
     barsHide: function () {\r
         $('#kiwi .toolbars').slideUp();\r
         $('#kiwi .control').slideUp();\r
-    },\r
+    }\r
 \r
-}
\ No newline at end of file
+};
\ No newline at end of file