From: Darren <darren@darrenwhitlen.com>
Date: Sun, 17 Feb 2013 18:50:17 +0000 (+0000)
Subject: Don't show a loader for query panels
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4c2d8d020b873c57c76574b11f29236aa1d2ec67;p=KiwiIRC.git

Don't show a loader for query panels
---

diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index 1bcbbdc..1bc9bb2 100644
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -579,7 +579,10 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({
         this.initializePanel(options);
         this.model.bind('change:topic', this.topic, this);
 
-        this.$el.append('<div class="initial_loader" style="margin:1em;">Joining channel.. <span class="loader"></span></div>');
+        // Only show the loader if this is a channel (ie. not a query)
+        if (this.model.isChannel()) {
+            this.$el.append('<div class="initial_loader" style="margin:1em;text-align:center;">Joining channel.. <span class="loader"></span></div>');
+        }
     },
 
     // Override the existing newMsg() method to remove the joining channel loader
@@ -587,6 +590,7 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({
         this.$el.find('.initial_loader').slideUp(function () {
             $(this).remove();
         });
+
         return this.constructor.__super__.newMsg.apply(this, arguments);
     },