Client version stored into kiwi.build_version

diff --git a/client/build.js b/client/build.js
index 3e55739f37d385be2a7d4eb18e6e7a7bcb8995e7..4b9df3b3369e36c21cb71016688695627d880b43 100644 (file)
--- a/client/build.js
+++ b/client/build.js
@@ -1,8 +1,9 @@
-var fs        = require('fs'),\r
-    uglifyJS  = require('uglify-js'),\r
-    _         = require('lodash'),\r
-    po2json   = require('po2json'),\r
-    config    = require('../server/configuration.js');\r
+var fs           = require('fs'),\r
+    uglifyJS     = require('uglify-js'),\r
+    _            = require('lodash'),\r
+    po2json      = require('po2json'),\r
+    config       = require('../server/configuration.js'),\r
+    package_json = require('../package.json');\r
 \r
 var FILE_ENCODING = 'utf-8',\r
     EOL = '\n';\r
@@ -213,7 +214,8 @@ fs.readdir(__dirname + '/src/translations', function (err, translation_files) {
  */\r
 \r
 var index_src = fs.readFileSync(__dirname + '/src/index.html.tmpl', FILE_ENCODING)\r
-    .replace(new RegExp('<%base_path%>', 'g'), config.get().http_base_path || '/kiwi');\r
+    .replace(new RegExp('<%base_path%>', 'g'), config.get().http_base_path || '/kiwi')\r
+    .replace(new RegExp('<%build_version%>', 'g'), package_json.version);\r
 \r
 fs.writeFile(__dirname + '/index.html', index_src, { encoding: FILE_ENCODING }, function (err) {\r
     if (!err) {\r

diff --git a/client/src/app.js b/client/src/app.js
index 8349f697aa7be36f603d6eb05ff7650522bc2061..5f19c816860a210d53b75d5dc7390755e4dcafa9 100644 (file)
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -15,6 +15,7 @@ _kiwi.applets = {};
  * and data (think: plugins)\r
  */\r
 _kiwi.global = {\r
+    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

diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl
index cb8d6b5811d18adee5cf58446b0f4b41eccf2094..4084154409da09939d9b1be9440a579b2b0c3d93 100644 (file)
--- a/client/src/index.html.tmpl
+++ b/client/src/index.html.tmpl
@@ -490,6 +490,9 @@
 \r
         // Run after all dependancies have been loaded\r
         jobs.onFinish(function startApp() {\r
+            // Kiwi IRC version this is built from\r
+            kiwi.build_version = '<%build_version%>';\r
+\r
             // Start the app\r
             kiwi.start(opts, function() {\r
                 // Load any plugins\r