From: Darren <darren@darrenwhitlen.com>
Date: Sat, 25 May 2013 23:36:02 +0000 (+0100)
Subject: remove joining channel loader / query window fix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7d2a27717901790a19a9a132c8337265ee7a5cec;p=KiwiIRC.git

remove joining channel loader / query window fix
---

diff --git a/client/assets/src/views/channel.js b/client/assets/src/views/channel.js
index 3c84ead..aaef808 100644
--- a/client/assets/src/views/channel.js
+++ b/client/assets/src/views/channel.js
@@ -14,13 +14,15 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({
         this.initializePanel(options);
         this.model.bind('change:topic', this.topic, this);
 
-        this.model.get('members').bind('add', function (member) {
-            if (member.get('nick') === this.model.collection.network.get('nick')) {
-                this.$el.find('.initial_loader').slideUp(function () {
-                    $(this).remove();
-                });
-            }
-        }, this);
+        if (this.model.get('members')) {
+            this.model.get('members').bind('add', function (member) {
+                if (member.get('nick') === this.model.collection.network.get('nick')) {
+                    this.$el.find('.initial_loader').slideUp(function () {
+                        $(this).remove();
+                    });
+                }
+            }, this);
+        }
 
         // Only show the loader if this is a channel (ie. not a query)
         if (this.model.isChannel()) {