Upgrade po2json v0.0.6 -> v0.2.3

[KiwiIRC.git] / client / src / app.js

diff --git a/client/src/app.js b/client/src/app.js
index c6eba1a3c076a43dac30891557ca3e0bffa2eee7..c15b76937c240240515f0dd2470d329e3f71f83a 100644 (file)
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -65,7 +65,8 @@ _kiwi.global = {
             var funcs = {\r
                 kiwi: 'kiwi', raw: 'raw', kick: 'kick', topic: 'topic',\r
                 part: 'part', join: 'join', action: 'action', ctcp: 'ctcp',\r
-                notice: 'notice', msg: 'privmsg', changeNick: 'changeNick'\r
+                notice: 'notice', msg: 'privmsg', changeNick: 'changeNick',\r
+                channelInfo: 'channelInfo', mode: 'mode'\r
             };\r
 \r
             // Proxy each gateway method\r
@@ -88,7 +89,7 @@ _kiwi.global = {
         ControlInput: function() {\r
             var obj = new this.EventComponent(_kiwi.app.controlbox);\r
             var funcs = {\r
-                processInput: 'run', addPluginIcon: 'addPluginIcon'\r
+                run: 'processInput', addPluginIcon: 'addPluginIcon'\r
             };\r
 \r
             _.each(funcs, function(controlbox_fn, func_name) {\r
@@ -109,17 +110,13 @@ _kiwi.global = {
 \r
         continueStart = function (locale, s, xhr) {\r
             if (locale) {\r
-                _kiwi.global.i18n = new Jed({locale_data: locale, domain: xhr.getResponseHeader('Content-Language')});\r
+                _kiwi.global.i18n = new Jed(locale);\r
             } else {\r
                 _kiwi.global.i18n = new Jed();\r
             }\r
 \r
             _kiwi.app = new _kiwi.model.Application(opts);\r
 \r
-            if (opts.kiwi_server) {\r
-                _kiwi.app.kiwi_server = opts.kiwi_server;\r
-            }\r
-\r
             // Start the client up\r
             _kiwi.app.start();\r
 \r
@@ -133,6 +130,9 @@ _kiwi.global = {
         _kiwi.global.settings = _kiwi.model.DataStore.instance('kiwi.settings');\r
         _kiwi.global.settings.load();\r
 \r
+        // Set the window title\r
+        window.document.title = opts.server_settings.client.window_title || 'Kiwi IRC';\r
+\r
         locale = _kiwi.global.settings.get('locale');\r
         if (!locale) {\r
             $.getJSON(opts.base_path + '/assets/locales/magic.json', continueStart);\r