Fix for _kiwi.global.componets.ControlInput method in app.js changing the orther...

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

diff --git a/client/src/app.js b/client/src/app.js
index f63db1fdd19834aa40beae1f1c60760bc8dd6915..b7506633bf848e7df5a33e05763f9dc0ff1a0e5f 100644 (file)
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -91,7 +91,7 @@ _kiwi.global = {
                 processInput: 'run', addPluginIcon: 'addPluginIcon'\r
             };\r
 \r
-            _.each(funcs, function(controlbox_fn, func_name) {\r
+            _.each(funcs, function(func_name, controlbox_fn) {\r
                 obj[func_name] = function() {\r
                     var fn_name = controlbox_fn;\r
                     return _kiwi.app.controlbox[fn_name].apply(_kiwi.app.controlbox, arguments);\r
@@ -107,13 +107,6 @@ _kiwi.global = {
         var continueStart, locale;\r
         opts = opts || {};\r
 \r
-        // Load the plugin manager\r
-        _kiwi.global.plugins = new _kiwi.model.PluginManager();\r
-\r
-        // Set up the settings datastore\r
-        _kiwi.global.settings = _kiwi.model.DataStore.instance('kiwi.settings');\r
-        _kiwi.global.settings.load();\r
-\r
         continueStart = function (locale, s, xhr) {\r
             if (locale) {\r
                 _kiwi.global.i18n = new Jed({locale_data: locale, domain: xhr.getResponseHeader('Content-Language')});\r
@@ -130,9 +123,19 @@ _kiwi.global = {
             // Start the client up\r
             _kiwi.app.start();\r
 \r
+            // Now everything has started up, load the plugin manager for third party plugins\r
+            _kiwi.global.plugins = new _kiwi.model.PluginManager();\r
+\r
             callback && callback();\r
         };\r
 \r
+        // Set up the settings datastore\r
+        _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