Irc component renamed; Kiwi network events;

diff --git a/client/assets/dev/app.js b/client/assets/dev/app.js
index c6b4370949834d3269dfe74ddac2d2e8c166f193..c6d2835ba962a6a1fe01c7d8f01292503129706d 100644 (file)
--- a/client/assets/dev/app.js
+++ b/client/assets/dev/app.js
@@ -43,7 +43,7 @@ _kiwi.global = {
                };\r
            },\r
 \r
-           Irc: function() {\r
+           Network: function() {\r
                var obj = new this.EventComponent(_kiwi.gateway);\r
                var funcs = {\r
                        kiwi: 'kiwi', raw: 'raw', kick: 'kick', topic: 'topic',\r
@@ -57,6 +57,7 @@ _kiwi.global = {
 \r
                return obj;\r
            },\r
+\r
            ControlInput: function() {\r
                var obj = new this.EventComponent(_kiwi.app.controlbox);\r
                var funcs = {\r

diff --git a/client/assets/dev/model_gateway.js b/client/assets/dev/model_gateway.js
index c9ccf016d33060ae97eb06ba4d6a5ea40b8127b4..61c6a45c6b6105914cd240fa24284af2d1d0b228 100644 (file)
--- a/client/assets/dev/model_gateway.js
+++ b/client/assets/dev/model_gateway.js
@@ -54,9 +54,8 @@ _kiwi.model.Gateway = function () {
 \r
     this.applyEventHandlers = function () {\r
         /*\r
-        TODO: Impliment event 'groups' to remove a listener group\r
-        kiwi.gateway.on('msg:#channel', my_function);\r
-        kiwi.gateway.on('msg:somenick', my_function);\r
+        kiwi.gateway.on('message:#channel', my_function);\r
+        kiwi.gateway.on('message:somenick', my_function);\r
 \r
         kiwi.gateway.on('notice:#channel', my_function);\r
         kiwi.gateway.on('action:somenick', my_function);\r
@@ -218,7 +217,8 @@ _kiwi.model.Gateway = function () {
 \r
 \r
     this.parseKiwi = function (command, data) {\r
-        console.log('kiwi event', command, data);\r
+        this.trigger('kiwi:' + command, data);\r
+        this.trigger('kiwi', data);\r
     };\r
     /*\r
         Events:\r

diff --git a/client/assets/plugin_example.html b/client/assets/plugin_example.html
index d9393dd682bb1d782b6886f57d56f6e2b0251a55..804409732fde85fbd45bbb3e7e45d620f9ef3267 100644 (file)
--- a/client/assets/plugin_example.html
+++ b/client/assets/plugin_example.html
@@ -41,16 +41,17 @@
                 this.set('title', 'Canvas Design');
                 this.view = new view({model: this});
 
-                var irc = kiwi.components.Irc();
+                var net = kiwi.components.Network();
                 var input = kiwi.components.ControlInput();
 
                 this.on('applet_loaded', function () {
-                    irc.on('message', function () {
+                    net.on('message', function () {
                         var bar = that.view.$el.find('.bar');
                         bar.width(bar.width()+1);
                     });
                 });
 
+                net.on('kiwi', function (event) { console.log('kiwi', event); });
                 input.on('command:graph', function (event) { console.log(event); });
             },