From: Darren <darren@darrenwhitlen.com>
Date: Sun, 17 Feb 2013 18:36:15 +0000 (+0000)
Subject: Client: Channel joining loader
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=567a2f7939db952d4512ce681d2f8fbc1065ca84;p=KiwiIRC.git

Client: Channel joining loader
---

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 3459573..754c2bf 100644
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -229,6 +229,14 @@ html, body { height:100%; }
 
 
 
+#kiwi .loader {
+    background:url(../img/loader.gif) no-repeat;
+    width:43px; height:11px;
+    display:inline-block;
+}
+
+
+
 
 
 /**
diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index f8c1732..1bcbbdc 100644
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -578,6 +578,16 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({
     initialize: function (options) {
         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>');
+    },
+
+    // Override the existing newMsg() method to remove the joining channel loader
+    newMsg: function () {
+        this.$el.find('.initial_loader').slideUp(function () {
+            $(this).remove();
+        });
+        return this.constructor.__super__.newMsg.apply(this, arguments);
     },
 
     topic: function (topic) {
diff --git a/client/assets/img/loader.gif b/client/assets/img/loader.gif
new file mode 100644
index 0000000..ecd6030
Binary files /dev/null and b/client/assets/img/loader.gif differ