From: Jack Allnutt <m2ys4u@Gmail.com>
Date: Tue, 6 Nov 2012 23:40:48 +0000 (+0000)
Subject: Merge branch 'development' into ircv3
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2427e69ee0551a9445f8042a2e7cfdb8b8b06b8e;p=KiwiIRC.git

Merge branch 'development' into ircv3
---

2427e69ee0551a9445f8042a2e7cfdb8b8b06b8e
diff --cc client/assets/dev/model_application.js
index 6fd5632,b08ea49..8c6950a
--- a/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@@ -570,26 -613,15 +613,26 @@@ _kiwi.model.Application = function () 
                  }
              });
  
 +            gw.on('onaway', function (event) {
 +                $.each(that.panels.models, function (index, panel) {
 +                    if (!panel.isChannel()) return;
 +
 +                    member = panel.get('members').getByNick(event.nick);
 +                    if (member) {
 +                        member.set('away', !(!event.trailing));
 +                    }
 +                });
 +            });
 +
  
              gw.on('onlist_start', function (data) {
-                 if (kiwi.app.channel_list) {
-                     kiwi.app.channel_list.close();
-                     delete kiwi.app.channel_list;
+                 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();
+                 var panel = new _kiwi.model.Applet(),
+                     applet = new _kiwi.applets.Chanlist();
  
                  panel.load(applet);