Moving "joining channel..." removal to view

diff --git a/client/assets/dev/model_channel.js b/client/assets/dev/model_channel.js
index aca182b95c8a0f7f13f254e6bb76fd6ede63729b..965c7106b0607dd616a74bebf7d88dc08926cc16 100644 (file)
--- a/client/assets/dev/model_channel.js
+++ b/client/assets/dev/model_channel.js
@@ -19,12 +19,6 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
         members.bind("add", function (member) {\r
             var show_message = _kiwi.global.settings.get('show_joins_parts');\r
             if (show_message === false) {\r
-                // TODO: This might be better off being moved to the view at some point.\r
-                if (member.get('nick') === that.collection.network.get('nick')) {\r
-                    this.view.$el.find('.initial_loader').slideUp(function () {\r
-                        $(this).remove();\r
-                    });\r
-                }\r
                 return;\r
             }\r
 \r

diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index d5dce4616acbd2d1473ab10d727a5db3828ac436..fd9b9f8c2a53c0cb59637ec2024c9c34e1b1c1e4 100644 (file)
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -703,6 +703,13 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({
     initialize: function (options) {\r
         this.initializePanel(options);\r
         this.model.bind('change:topic', this.topic, this);\r
+        this.model.get('members').bind('add', function (member) {\r
+            if (member.get('nick') === that.collection.network.get('nick')) {\r
+                this.view.$el.find('.initial_loader').slideUp(function () {\r
+                    $(this).remove();\r
+                });\r
+            }\r
+        }, this);\r
 \r
         // Only show the loader if this is a channel (ie. not a query)\r
         if (this.model.isChannel()) {\r