From: Darren <darren@darrenwhitlen.com>
Date: Wed, 7 May 2014 23:38:03 +0000 (+0100)
Subject: Loading text theme tidy up
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3a146f27fa918a65e8d466a40645ea770ea62117;p=KiwiIRC.git

Loading text theme tidy up
---

diff --git a/client/src/app.js b/client/src/app.js
index 39121b2..861b8f1 100644
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -158,12 +158,8 @@ _kiwi.global = {
         }
 
         jobs.registerJob('load_text_theme');
-        text_theme = opts.text_theme;
-        if (!text_theme) {
-            $.getJSON(opts.base_path + '/assets/text_themes/default.json', textThemeLoaded);
-        } else {
-            $.getJSON(opts.base_path + '/assets/text_themes/' + text_theme + '.json', textThemeLoaded);
-        }
+        text_theme = opts.server_settings.client.settings.text_theme || 'default';
+        $.getJSON(opts.base_path + '/assets/text_themes/' + text_theme + '.json', textThemeLoaded);
     },
 
     start: function() {
diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl
index 4bfcc8e..66eb835 100644
--- a/client/src/index.html.tmpl
+++ b/client/src/index.html.tmpl
@@ -578,7 +578,6 @@
             opts.translations = data.translations;
             opts.locale = data.locale;
             opts.themes = data.themes;
-            opts.text_theme = data.server_settings.client.settings.text_theme;
 
             if (typeof data.kiwi_server !== 'undefined')
                 opts.kiwi_server = data.kiwi_server;