Merge branch 'code-style-fixes' of https://github.com/spadgos/KiwiIRC into spadgos...
[KiwiIRC.git] / client / src / applets / settings.js
index 5d646be208ac0a954dc6a316337ec83f44a9c91f..c94b0c2f44c2bccce4cdbe1539b018a4497d0498 100644 (file)
@@ -9,23 +9,23 @@
 \r
         initialize: function (options) {\r
             var text = {\r
-                tabs: _kiwi.global.i18n.translate('client_applets_settings_channelview_tabs').fetch(),\r
-                list: _kiwi.global.i18n.translate('client_applets_settings_channelview_list').fetch(),\r
-                large_amounts_of_chans: _kiwi.global.i18n.translate('client_applets_settings_channelview_list_notice').fetch(),\r
-                join_part: _kiwi.global.i18n.translate('client_applets_settings_notification_joinpart').fetch(),\r
-                count_all_activity: _kiwi.global.i18n.translate('client_applets_settings_notification_count_all_activity').fetch(),\r
-                timestamps: _kiwi.global.i18n.translate('client_applets_settings_timestamp').fetch(),\r
-                timestamp_24: _kiwi.global.i18n.translate('client_applets_settings_timestamp_24_hour').fetch(),\r
-                mute: _kiwi.global.i18n.translate('client_applets_settings_notification_sound').fetch(),\r
-                emoticons: _kiwi.global.i18n.translate('client_applets_settings_emoticons').fetch(),\r
-                scroll_history: _kiwi.global.i18n.translate('client_applets_settings_history_length').fetch(),\r
-                languages: _kiwi.app.translations,\r
-                default_client: _kiwi.global.i18n.translate('client_applets_settings_default_client').fetch(),\r
-                make_default: _kiwi.global.i18n.translate('client_applets_settings_default_client_enable').fetch(),\r
-                locale_restart_needed: _kiwi.global.i18n.translate('client_applets_settings_locale_restart_needed').fetch(),\r
-                default_note: _kiwi.global.i18n.translate('client_applets_settings_default_client_notice').fetch('<a href="chrome://settings/handlers">chrome://settings/handlers</a>'),\r
-                html5_notifications: _kiwi.global.i18n.translate('client_applets_settings_html5_notifications').fetch(),\r
-                enable_notifications: _kiwi.global.i18n.translate('client_applets_settings_enable_notifications').fetch(),\r
+                tabs                  : translateText('client_applets_settings_channelview_tabs'),\r
+                list                  : translateText('client_applets_settings_channelview_list'),\r
+                large_amounts_of_chans: translateText('client_applets_settings_channelview_list_notice'),\r
+                join_part             : translateText('client_applets_settings_notification_joinpart'),\r
+                count_all_activity    : translateText('client_applets_settings_notification_count_all_activity'),\r
+                timestamps            : translateText('client_applets_settings_timestamp'),\r
+                timestamp_24          : translateText('client_applets_settings_timestamp_24_hour'),\r
+                mute                  : translateText('client_applets_settings_notification_sound'),\r
+                emoticons             : translateText('client_applets_settings_emoticons'),\r
+                scroll_history        : translateText('client_applets_settings_history_length'),\r
+                languages             : _kiwi.app.translations,\r
+                default_client        : translateText('client_applets_settings_default_client'),\r
+                make_default          : translateText('client_applets_settings_default_client_enable'),\r
+                locale_restart_needed : translateText('client_applets_settings_locale_restart_needed'),\r
+                default_note          : translateText('client_applets_settings_default_client_notice', '<a href="chrome://settings/handlers">chrome://settings/handlers</a>'),\r
+                html5_notifications   : translateText('client_applets_settings_html5_notifications'),\r
+                enable_notifications  : translateText('client_applets_settings_enable_notifications'),\r
                 theme_thumbnails: _.map(_kiwi.app.themes, function (theme) {\r
                     return _.template($('#tmpl_theme_thumbnail').html().trim(), theme);\r
                 })\r
             this.$el = $(_.template($('#tmpl_applet_settings').html().trim(), text));\r
 \r
             if (!navigator.registerProtocolHandler) {\r
-                this.$el.find('.protocol_handler').remove();\r
+                this.$('.protocol_handler').remove();\r
             }\r
 \r
-\r
             if (_kiwi.utils.notifications.allowed() !== null) {\r
-                this.$el.find('.notification_enabler').remove();\r
+                this.$('.notification_enabler').remove();\r
             }\r
 \r
             // Incase any settings change while we have this open, update them\r
 \r
         loadSettings: function () {\r
 \r
-            var that = this;\r
-\r
-            $.each(_kiwi.global.settings.attributes, function(key, value) {\r
+            _.each(_kiwi.global.settings.attributes, function(value, key) {\r
 \r
-                var $el = $('[data-setting="' + key + '"]', that.$el);\r
+                var $el = this.$('[data-setting="' + key + '"]');\r
 \r
                 // Only deal with settings we have a UI element for\r
                 if (!$el.length)\r
                         $el.prop('checked', value);\r
                         break;\r
                     case 'radio':\r
-                        $('[data-setting="' + key + '"][value="' + value + '"]', that.$el).prop('checked', true);\r
+                        this.$('[data-setting="' + key + '"][value="' + value + '"]').prop('checked', true);\r
                         break;\r
                     case 'text':\r
                         $el.val(value);\r
                         break;\r
                     case 'select-one':\r
-                        $('[value="' + value + '"]', that.$el).prop('selected', true);\r
+                        this.$('[value="' + value + '"]').prop('selected', true);\r
                         break;\r
                     default:\r
-                        $('[data-setting="' + key + '"][data-value="' + value + '"]', that.$el).addClass('active');\r
+                        this.$('[data-setting="' + key + '"][data-value="' + value + '"]').addClass('active');\r
                         break;\r
                 }\r
-            });\r
+            }, this);\r
         },\r
 \r
         saveSettings: function (event) {\r
             var value,\r
                 settings = _kiwi.global.settings,\r
-                $setting = $(event.currentTarget, this.$el);\r
+                $setting = $(event.currentTarget);\r
 \r
             switch (event.currentTarget.type) {\r
                 case 'checkbox':\r
         selectTheme: function(event) {\r
             event.preventDefault();\r
 \r
-            $('[data-setting="theme"].active', this.$el).removeClass('active');\r
+            this.$('[data-setting="theme"].active').removeClass('active');\r
             $(event.currentTarget).addClass('active').trigger('change');\r
         },\r
 \r
         enableNotifications: function(event){\r
             event.preventDefault();\r
             var notifications = _kiwi.utils.notifications;\r
+\r
             notifications.requestPermission().always(_.bind(function () {\r
                 if (notifications.allowed() !== null) {\r
                     this.$('.notification_enabler').remove();\r
 \r
     var Applet = Backbone.Model.extend({\r
         initialize: function () {\r
-            this.set('title', _kiwi.global.i18n.translate('client_applets_settings_title').fetch());\r
+            this.set('title', translateText('client_applets_settings_title'));\r
             this.view = new View();\r
         }\r
     });\r