Network events + panels moved into model_network

[KiwiIRC.git] / client / assets / dev / build.js

diff --git a/client/assets/dev/build.js b/client/assets/dev/build.js
index 698bbb9a7d036cf117fc42aef0a69a50f315d65b..723db1656eee41ad571e43e85e781b8b670457a4 100644 (file)
--- a/client/assets/dev/build.js
+++ b/client/assets/dev/build.js
@@ -1,6 +1,6 @@
 var fs        = require('fs'),\r
     uglyfyJS  = require('uglify-js'),\r
-    _         = require('underscore'),\r
+    _         = require('lodash'),\r
     config    = require('./../../../server/configuration.js');\r
 \r
 var FILE_ENCODING = 'utf-8',\r
@@ -32,6 +32,7 @@ var src = concat([
     __dirname + '/app.js',\r
     __dirname + '/model_application.js',\r
     __dirname + '/model_gateway.js',\r
+    __dirname + '/model_network.js',\r
     __dirname + '/model_member.js',\r
     __dirname + '/model_memberlist.js',\r
     __dirname + '/model_panel.js',\r
@@ -46,6 +47,7 @@ var src = concat([
     __dirname + '/applet_settings.js',\r
     __dirname + '/applet_nickserv.js',\r
     __dirname + '/applet_chanlist.js',\r
+    __dirname + '/applet_scripteditor.js',\r
 \r
     __dirname + '/utils.js',\r
     __dirname + '/view.js'\r
@@ -83,15 +85,15 @@ console.log('kiwi.js and kiwi.min.js built');
 \r
 var index_src = fs.readFileSync(__dirname + '/index.html.tmpl', FILE_ENCODING);\r
 var vars = {\r
-    base_path: config.get().http_base_path,\r
+    base_path: config.get().http_base_path || '/kiwi',\r
     cache_buster: Math.ceil(Math.random() * 9000).toString(),\r
-    server_settings: '{}',\r
-    client_plugins: '[]'\r
+    server_settings: {},\r
+    client_plugins: []\r
 };\r
 \r
 // Any restricted server mode set?\r
 if (config.get().restrict_server) {\r
-    vars.server_settings = JSON.stringify({\r
+    vars.server_settings = {\r
         connection: {\r
             server: config.get().restrict_server,\r
             port: config.get().restrict_server_port || 6667,\r
@@ -100,15 +102,21 @@ if (config.get().restrict_server) {
             nick: config.get().restrict_server_nick,\r
             allow_change: false\r
         }\r
-    });\r
+    };\r
+}\r
+\r
+// Any client default settings?\r
+if (config.get().client) {\r
+    vars.server_settings.client = config.get().client;\r
 }\r
 \r
 // Any client plugins?\r
 if (config.get().client_plugins && config.get().client_plugins.length > 0) {\r
-    vars.client_plugins = JSON.stringify(config.get().client_plugins);\r
+    vars.client_plugins = config.get().client_plugins;\r
 }\r
 \r
 _.each(vars, function(value, key) {\r
+    if (typeof value === 'object') value = JSON.stringify(value);\r
     index_src = index_src.replace(new RegExp('<%' + key + '%>', 'g'), value);\r
 });\r
 \r