From 567a2f7939db952d4512ce681d2f8fbc1065ca84 Mon Sep 17 00:00:00 2001
From: Darren <darren@darrenwhitlen.com>
Date: Sun, 17 Feb 2013 18:36:15 +0000
Subject: [PATCH] Client: Channel joining loader

---
 client/assets/css/style.css  |   8 ++++++++
 client/assets/dev/view.js    |  10 ++++++++++
 client/assets/img/loader.gif | Bin 0 -> 404 bytes
 3 files changed, 18 insertions(+)
 create mode 100644 client/assets/img/loader.gif

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 0000000000000000000000000000000000000000..ecd6030d0939133adffaee244c6cfee7b56dc8dd
GIT binary patch
literal 404
zcmZ?wbhEHb)Mnsj_{hNU|NnpYt?o;1Edi2>|GE8KLxP<h16+;t444@i7#I})NjVp#
zCYGe8D3oWGWGEzNC069*C#L9S=B4E`DE?&O<N~VF0b&M_fecJWEqxrPr`^2K{P`%C
z^u4gpr&}MGwM9fOOjEDDH*4Q=o^)N$>+PrXejVBT({9HC1tT9(pe2~b*d75Iqrjh-
zym3~`@ijG{XC&VH-jgz8#{5$Yy_~%Ybat?3pWV3jr3&9B##9lh{D@DreW&~`KbobJ
z6m)z&b`wDkGXR>na#mLKo%~1qT*BKcA6E7(xw2rzF1}^lhhF<6n{_@vdG6)Upjk84
zn4U4{aX<C)(@da=E7oB((E;k!8B=z#OV@4uwKLUcg~@z(xj?NF^`q-n{^r|gHhb&b
m{=b_ZPfT%+efvz?tL%iUu)v-KrE>zJznDZA7_33z1_l76N0*oY

literal 0
HcmV?d00001

-- 
2.25.1