Switching the old RPC methods to the websocketrpc

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

diff --git a/client/src/app.js b/client/src/app.js
index 39121b2f4cf84e6a83faf08c8b6b5dc8c8c0dff4..e063bc47b6804faac81f726ad369660608a65c7f 100644 (file)
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -18,12 +18,7 @@ _kiwi.global = {
     build_version: '',  // Kiwi IRC version this is built from (Set from index.html)\r
     settings: undefined, // Instance of _kiwi.model.DataStore\r
     plugins: undefined,\r
-    utils: undefined, // TODO: Re-usable methods\r
-    user: undefined, // TODO: Limited user methods\r
-    server: undefined, // TODO: Limited server methods\r
-\r
-    // TODO: think of a better term for this as it will also refer to queries\r
-    channels: undefined, // TODO: Limited access to panels list\r
+    utils: {}, // TODO: Re-usable methods\r
 \r
     addMediaMessageType: function(match, buildHtml) {\r
         _kiwi.view.MediaMessage.addType(match, buildHtml);\r
@@ -158,12 +153,8 @@ _kiwi.global = {
         }\r
 \r
         jobs.registerJob('load_text_theme');\r
-        text_theme = opts.text_theme;\r
-        if (!text_theme) {\r
-            $.getJSON(opts.base_path + '/assets/text_themes/default.json', textThemeLoaded);\r
-        } else {\r
-            $.getJSON(opts.base_path + '/assets/text_themes/' + text_theme + '.json', textThemeLoaded);\r
-        }\r
+        text_theme = opts.server_settings.client.settings.text_theme || 'default';\r
+        $.getJSON(opts.base_path + '/assets/text_themes/' + text_theme + '.json', textThemeLoaded);\r
     },\r
 \r
     start: function() {\r