From 62c18d2d332ffd55d6d043e6fbf9cda5fc1778fe Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 25 Jul 2013 12:36:56 +0100 Subject: [PATCH] Quick hack to get plugins working again --- client/assets/src/app.js | 4 +++- client/assets/src/index.html.tmpl | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/client/assets/src/app.js b/client/assets/src/app.js index 2fe2f51..f63db1f 100644 --- a/client/assets/src/app.js +++ b/client/assets/src/app.js @@ -103,7 +103,7 @@ _kiwi.global = { }, // Entry point to start the kiwi application - start: function (opts) { + start: function (opts, callback) { var continueStart, locale; opts = opts || {}; @@ -129,6 +129,8 @@ _kiwi.global = { // Start the client up _kiwi.app.start(); + + callback && callback(); }; locale = _kiwi.global.settings.get('locale'); diff --git a/client/assets/src/index.html.tmpl b/client/assets/src/index.html.tmpl index 63fef89..470814c 100644 --- a/client/assets/src/index.html.tmpl +++ b/client/assets/src/index.html.tmpl @@ -413,14 +413,14 @@ }; // Start the app - kiwi.start(opts); - - // Load any plugins - if (opts.client_plugins && opts.client_plugins.length > 0) { - _.each(opts.client_plugins, function (plugin_url) { - kiwi.plugins.load(plugin_url); - }); - } + kiwi.start(opts, function() { + // Load any plugins + if (opts.client_plugins && opts.client_plugins.length > 0) { + _.each(opts.client_plugins, function (plugin_url) { + kiwi.plugins.load(plugin_url); + }); + } + }); } -- 2.25.1