Merge branch 'development'

[KiwiIRC.git] / client / src / applets / chanlist.js

diff --git a/client/src/applets/chanlist.js b/client/src/applets/chanlist.js
index 8c286fdf7c598584ec26e8dc4a44555aa5e4bfff..39c63a6357f36bf5344e4d8b5c9db0025cc94358 100644 (file)
--- a/client/src/applets/chanlist.js
+++ b/client/src/applets/chanlist.js
@@ -36,30 +36,30 @@
             if($('.applet_chanlist .users_title').find('span.chanlist_sort_users').length == 0) {\r
                 this.$('.users_title').append('<span class="chanlist_sort_users">&nbsp;&nbsp;</span>');\r
             } else {\r
-                this.$('.users_title span.chanlist_sort_users').removeClass('icon-sort-up');\r
-                this.$('.users_title span.chanlist_sort_users').removeClass('icon-sort-down');\r
+                this.$('.users_title span.chanlist_sort_users').removeClass('fa fa-sort-desc');\r
+                this.$('.users_title span.chanlist_sort_users').removeClass('fa fa-sort-asc');\r
             }\r
             if ($('.applet_chanlist .channel_name_title').find('span.chanlist_sort_names').length == 0) {\r
                 this.$('.channel_name_title').append('<span class="chanlist_sort_names">&nbsp;&nbsp;</span>');\r
             } else {\r
-                this.$('.channel_name_title span.chanlist_sort_names').removeClass('icon-sort-up');\r
-                this.$('.channel_name_title span.chanlist_sort_names').removeClass('icon-sort-down');\r
+                this.$('.channel_name_title span.chanlist_sort_names').removeClass('fa fa-sort-desc');\r
+                this.$('.channel_name_title span.chanlist_sort_names').removeClass('fa fa-sort-asc');\r
             }\r
 \r
             // Push the new sort icon\r
             switch (this.order) {\r
                 case 'user_desc':\r
                 default:\r
-                    this.$('.users_title span.chanlist_sort_users').addClass('icon-sort-down');\r
+                    this.$('.users_title span.chanlist_sort_users').addClass('fa fa-sort-asc');\r
                     break;\r
                 case 'user_asc':\r
-                    this.$('.users_title span.chanlist_sort_users').addClass('icon-sort-up');\r
+                    this.$('.users_title span.chanlist_sort_users').addClass('fa fa-sort-desc');\r
                     break;\r
                 case 'name_asc':\r
-                    this.$('.channel_name_title span.chanlist_sort_names').addClass('icon-sort-up');\r
+                    this.$('.channel_name_title span.chanlist_sort_names').addClass('fa fa-sort-desc');\r
                     break;\r
                 case 'name_desc':\r
-                    this.$('.channel_name_title span.chanlist_sort_names').addClass('icon-sort-down');\r
+                    this.$('.channel_name_title span.chanlist_sort_names').addClass('fa fa-sort-asc');\r
                     break;\r
             }\r
 \r
@@ -147,8 +147,8 @@
             this.view = new View();\r
 \r
             this.network = _kiwi.global.components.Network();\r
-            this.network.on('onlist_channel', this.onListChannel, this);\r
-            this.network.on('onlist_start', this.onListStart, this);\r
+            this.network.on('list_channel', this.onListChannel, this);\r
+            this.network.on('list_start', this.onListStart, this);\r
         },\r
 \r
 \r