Move window_title config option to client settings

diff --git a/client/src/app.js b/client/src/app.js
index 7fd8e809effb9866aefbc4b5a28ae9038b5c1456..a164633708094bb5beeb90dc05a112a1db6a6524 100644 (file)
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -134,7 +134,7 @@ _kiwi.global = {
         _kiwi.global.settings.load();\r
 \r
         // Set the window title\r
-        window.document.title = opts.server_settings.window_title || 'Kiwi IRC';\r
+        window.document.title = opts.server_settings.client.window_title || 'Kiwi IRC';\r
 \r
         locale = _kiwi.global.settings.get('locale');\r
         if (!locale) {\r

diff --git a/client/src/views/application.js b/client/src/views/application.js
index 1e0950002dd7a286e655124cd88b4d790f09a958..6999bb85e7c50ca8e03b08db4bb4d0346e657c30 100644 (file)
--- a/client/src/views/application.js
+++ b/client/src/views/application.js
@@ -192,7 +192,7 @@ _kiwi.view.Application = Backbone.View.extend({
                 var tmr;
                 var has_focus = true;
                 var state = 0;
-                var default_title = _kiwi.app.server_settings.window_title;
+                var default_title = _kiwi.app.server_settings.client.window_title;
                 var title = 'Kiwi IRC';
 
                 this.setTitle = function (new_title) {

diff --git a/config.example.js b/config.example.js
index 355cc02a6994e10ce0b619f7f5e5e19bdf31cd15..85df3bf307e7a40e717a830420710fc6bf75915a 100644 (file)
--- a/config.example.js
+++ b/config.example.js
@@ -78,10 +78,6 @@ conf.default_encoding = 'utf8';
 */
 //conf.default_gecos = 'Web IRC Client';
 
-/*
-* Window title
-*/
-conf.window_title = 'Kiwi IRC';
 
 
 /*
@@ -187,7 +183,8 @@ conf.client = {
         show_timestamps: false,
         mute_sounds: false,
         show_emoticons: true
-    }
+    },
+    window_title: 'Kiwi IRC'
 };
 
 

diff --git a/server/httphandler.js b/server/httphandler.js
index 0aef2c0d12471797f3aff82f7efe7ef9b20746c4..ee8b7e181afd63a4139d3ca25de9bc24e1e694e3 100644 (file)
--- a/server/httphandler.js
+++ b/server/httphandler.js
@@ -306,13 +306,6 @@ function generateSettings(request, debug, callback) {
         vars.server_settings.client = config.get().client;
     }
 
-    // Get the window title
-    if (config.get().window_title) {
-        vars.server_settings.window_title = config.get().window_title;
-    } else {
-        vars.server_settings.window_title = 'Kiwi IRC';
-    }
-
     // Any client plugins?
     if (config.get().client_plugins && config.get().client_plugins.length > 0) {
         vars.client_plugins = config.get().client_plugins;