Client: Show joins/parts in settings applet

diff --git a/client/assets/dev/applet_settings.js b/client/assets/dev/applet_settings.js
index 926e4981dc03df811a6d9d1c0687ca16277780dc..481a1c9170993f2ac0fa393f10ae7098f9aa9f31 100644 (file)
--- a/client/assets/dev/applet_settings.js
+++ b/client/assets/dev/applet_settings.js
@@ -11,6 +11,12 @@
 \r
             this.$el.find('.setting-theme').val(settings.get('theme'));\r
             this.$el.find('.setting-scrollback').val(settings.get('scrollback'));\r
+\r
+            if (typeof settings.get('show_joins_parts') === 'undefined' || settings.get('show_joins_parts')) {\r
+                this.$el.find('.setting-show_joins_parts').attr('checked', true);\r
+            } else {\r
+                this.$el.find('.setting-show_joins_parts').attr('checked', false);\r
+            }\r
         },\r
         \r
         saveSettings: function () {\r
@@ -18,6 +24,7 @@
 \r
             settings.set('theme', $('.setting-theme', this.$el).val());\r
             settings.set('scrollback', $('.setting-scrollback', this.$el).val());\r
+            settings.set('show_joins_parts', $('.setting-show_joins_parts', this.$el).is(':checked'));\r
 \r
             settings.save();\r
         }\r

diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl
index ede9c728e6a3bd22f75672686180a71cddc9018e..054aa574b334ccc844cd023b4970eec6cba64bd5 100644 (file)
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -137,8 +137,8 @@
                 </tr>\r
 \r
                 <tr>\r
-                    <td>Auto-reconnect</td>\r
-                    <td><input type="checkbox" class="setting-reconnect" /></td>\r
+                    <td>Show joins/parts</td>\r
+                    <td><input type="checkbox" class="setting-show_joins_parts" /></td>\r
                 </tr>\r
             </table>\r
 \r

diff --git a/client/assets/dev/model_channel.js b/client/assets/dev/model_channel.js
index 76931d782f7e35cc4976293a39001acd062f72f8..b6985648df65867c435ba31565fd8db07a878717 100644 (file)
--- a/client/assets/dev/model_channel.js
+++ b/client/assets/dev/model_channel.js
@@ -15,7 +15,7 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
 \r
         members = this.get("members");\r
         members.bind("add", function (member) {\r
-            var show_message = _kiwi.global.settings.get('show_join_parts');\r
+            var show_message = _kiwi.global.settings.get('show_joins_parts');\r
             if (show_message === false) {\r
                 return;\r
             }\r
@@ -24,7 +24,7 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
         }, this);\r
 \r
         members.bind("remove", function (member, members, options) {\r
-            var show_message = _kiwi.global.settings.get('show_join_parts');\r
+            var show_message = _kiwi.global.settings.get('show_joins_parts');\r
             if (show_message === false) {\r
                 return;\r
             }\r