Quick hack to get plugins working again

diff --git a/client/assets/src/app.js b/client/assets/src/app.js
index 2fe2f516fd061afeefa670e5e30cf54677086706..f63db1fdd19834aa40beae1f1c60760bc8dd6915 100644 (file)
--- a/client/assets/src/app.js
+++ b/client/assets/src/app.js
@@ -103,7 +103,7 @@ _kiwi.global = {
     },\r
 \r
     // Entry point to start the kiwi application\r
-    start: function (opts) {\r
+    start: function (opts, callback) {\r
         var continueStart, locale;\r
         opts = opts || {};\r
 \r
@@ -129,6 +129,8 @@ _kiwi.global = {
 \r
             // Start the client up\r
             _kiwi.app.start();\r
+\r
+            callback && callback();\r
         };\r
 \r
         locale = _kiwi.global.settings.get('locale');\r

diff --git a/client/assets/src/index.html.tmpl b/client/assets/src/index.html.tmpl
index 63fef896a812825659f5d03dc80e8a7d148eda2a..470814cb188e798eaaec57a2c86edf2864e4190b 100644 (file)
--- a/client/assets/src/index.html.tmpl
+++ b/client/assets/src/index.html.tmpl
@@ -413,14 +413,14 @@
             };\r
 \r
             // Start the app\r
-            kiwi.start(opts);\r
-\r
-            // Load any plugins\r
-            if (opts.client_plugins && opts.client_plugins.length > 0) {\r
-                _.each(opts.client_plugins, function (plugin_url) {\r
-                    kiwi.plugins.load(plugin_url);\r
-                });\r
-            }\r
+            kiwi.start(opts, function() {\r
+                // Load any plugins\r
+                if (opts.client_plugins && opts.client_plugins.length > 0) {\r
+                    _.each(opts.client_plugins, function (plugin_url) {\r
+                        kiwi.plugins.load(plugin_url);\r
+                    });\r
+                }\r
+            });\r
         }\r
 \r
 \r