Client: Private `kiwi` namespace renamed to `_kiwi`

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

diff --git a/client/assets/dev/app.js b/client/assets/dev/app.js
index c680b417d96c4bfccd6252649705c16e23dbe5f1..50a0fc24117620b0bf91f73658c1529f9c3a2dc5 100644 (file)
--- a/client/assets/dev/app.js
+++ b/client/assets/dev/app.js
@@ -1,12 +1,12 @@
-// Holds anything kiwi client specific (ie. front, gateway, kiwi.plugs..)\r
+// Holds anything kiwi client specific (ie. front, gateway, _kiwi.plugs..)\r
 /**\r
 *   @namespace\r
 */\r
-var kiwi = {};\r
+var _kiwi = {};\r
 \r
-kiwi.model = {};\r
-kiwi.view = {};\r
-kiwi.applets = {};\r
+_kiwi.model = {};\r
+_kiwi.view = {};\r
+_kiwi.applets = {};\r
 \r
 \r
 /**\r
@@ -14,7 +14,7 @@ kiwi.applets = {};
  * Will be used to access a limited subset of kiwi functionality\r
  * and data (think: plugins)\r
  */\r
-kiwi.global = {\r
+_kiwi.global = {\r
        utils: undefined, // Re-usable methods\r
        gateway: undefined,\r
        user: undefined,\r
@@ -28,13 +28,13 @@ kiwi.global = {
        start: function (opts) {\r
                opts = opts || {};\r
 \r
-               kiwi.app = new kiwi.model.Application(opts);\r
+               _kiwi.app = new _kiwi.model.Application(opts);\r
 \r
                if (opts.kiwi_server) {\r
-                       kiwi.app.kiwi_server = opts.kiwi_server;\r
+                       _kiwi.app.kiwi_server = opts.kiwi_server;\r
                }\r
 \r
-               kiwi.app.start();\r
+               _kiwi.app.start();\r
 \r
                return true;\r
        }\r
@@ -44,5 +44,8 @@ kiwi.global = {
 \r
 // If within a closure, expose the kiwi globals\r
 if (typeof global !== 'undefined') {\r
-       global.kiwi = kiwi.global;\r
+       global.kiwi = _kiwi.global;\r
+} else {\r
+       // Not within a closure so set a var in the current scope\r
+       var kiwi = _kiwi.global;\r
 }
\ No newline at end of file