Merge with upstrea/development

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

diff --git a/client/src/applets/settings.js b/client/src/applets/settings.js
index bc16d376698347fb958cde596eb49233dc80b55d..aa5896d22d319520d69f49a8c006b01e2d021acc 100644 (file)
--- a/client/src/applets/settings.js
+++ b/client/src/applets/settings.js
@@ -13,8 +13,9 @@
                 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_joins_parts: _kiwi.global.i18n.translate('client_applets_settings_notification_countjoinparts').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
@@ -24,7 +25,10 @@
                 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
+                enable_notifications: _kiwi.global.i18n.translate('client_applets_settings_enable_notifications').fetch(),\r
+                theme_thumbnails: _.map(_kiwi.app.themes, function (theme) {\r
+                    return _.template($('#tmpl_theme_thumbnail').html().trim(), theme);\r
+                })\r
             };\r
             this.$el = $(_.template($('#tmpl_applet_settings').html().trim(), text));\r
 \r
@@ -118,7 +122,13 @@
         },\r
 \r
         enableNoticiations: function(event){\r
-            window.webkitNotifications.requestPermission();\r
+            event.preventDefault();\r
+\r
+            if ('webkitNotifications' in window) {\r
+                window.webkitNotifications.requestPermission();\r
+            } else if ('Notification' in window) {\r
+                Notification.requestPermission();\r
+            }\r
         }\r
 \r
     });\r