Network objects listening for IRC connection events only

diff --git a/client/src/app.js b/client/src/app.js
index ca479370f91de068b0fd663e5358dd33afb8e6f1..2b7b0af7016c93ddff7b259535fa8253379b2c87 100644 (file)
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -84,6 +84,8 @@ _kiwi.global = {
 \r
             if (typeof connection_id !== 'undefined') {\r
                 connection_event = 'connection:' + connection_id.toString();\r
+            } else {\r
+                connection_event = 'connection';\r
             }\r
 \r
             var obj = new this.EventComponent(_kiwi.gateway, connection_event);\r

diff --git a/client/src/models/application.js b/client/src/models/application.js
index ef12636bf1c28a9bbb096b2bd72580b7a2282690..cf47c5960a650761eced9cb259e0de4ae753148f 100644 (file)
--- a/client/src/models/application.js
+++ b/client/src/models/application.js
@@ -167,7 +167,8 @@
         bindGatewayCommands: function (gw) {\r
             var that = this;\r
 \r
-            gw.on('connect', function (event) {\r
+            // As soon as an IRC connection is made, show the full client UI\r
+            gw.on('connection:connect', function (event) {\r
                 that.view.barsShow();\r
             });\r
 \r

diff --git a/client/src/models/gateway.js b/client/src/models/gateway.js
index 1bad0a4156eb991cb94975577e87fbc91e9ec72f..1eddbdee0889609c426b6924834be8e3438ba33d 100644 (file)
--- a/client/src/models/gateway.js
+++ b/client/src/models/gateway.js
@@ -242,7 +242,8 @@ _kiwi.model.Gateway = function () {
         }\r
 \r
         // Trigger the global events\r
-        that.trigger(command, data);\r
+        that.trigger('connection', {event_name: command, event_data: data});\r
+        that.trigger('connection:' + command, data);\r
     };\r
 \r
     this.rpcCall = function(method, connection_id) {\r