From 7d2a27717901790a19a9a132c8337265ee7a5cec Mon Sep 17 00:00:00 2001 From: Darren Date: Sun, 26 May 2013 00:36:02 +0100 Subject: [PATCH] remove joining channel loader / query window fix --- client/assets/src/views/channel.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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()) { -- 2.25.1