From b24da6bab474717f23a867ba6e7806140cdfbf78 Mon Sep 17 00:00:00 2001 From: Darren Date: Sun, 21 Apr 2013 16:04:35 +0100 Subject: [PATCH] Merge with development branch x2 --- client/assets/dev/model_network.js | 32 ++---------------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/client/assets/dev/model_network.js b/client/assets/dev/model_network.js index 56f64cc..18ccda6 100644 --- a/client/assets/dev/model_network.js +++ b/client/assets/dev/model_network.js @@ -75,8 +75,6 @@ this.gateway.on('whois', onWhois, this); this.gateway.on('away', onAway, this); this.gateway.on('list_start', onListStart, this); - this.gateway.on('list_channel', onListChannel, this); - this.gateway.on('list_end', onListEnd, this); } }); @@ -494,34 +492,8 @@ function onListStart(event) { - if (_kiwi.app.channel_list) { - _kiwi.app.channel_list.close(); - delete _kiwi.app.channel_list; - } - - var panel = new _kiwi.model.Applet(), - applet = new _kiwi.applets.Chanlist(); - - panel.load(applet); - - _kiwi.app.panels.add(panel); - panel.view.show(); - - _kiwi.app.channel_list = applet; - } - - - - function onListChannel(event) { - // TODO: Put this listener within the applet itself - _kiwi.app.channel_list.addChannel(event.chans); - } - - - - function onListEnd(event) { - // TODO: Put this listener within the applet itself - delete _kiwi.app.channel_list; + var chanlist = _kiwi.model.Applet.loadOnce('kiwi_chanlist'); + chanlist.view.show(); } -- 2.25.1