From f66c4823814096d4b4ba0950eef583be035e37c8 Mon Sep 17 00:00:00 2001
From: Darren <darren@darrenwhitlen.com>
Date: Mon, 11 Nov 2013 10:16:13 +0000
Subject: [PATCH] Client plugins loading correctly with new HTML templates

---
 client/src/app.js                  | 14 +++++++-------
 client/src/models/pluginmanager.js |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/src/app.js b/client/src/app.js
index f63db1f..c6eba1a 100644
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -107,13 +107,6 @@ _kiwi.global = {
         var continueStart, locale;
         opts = opts || {};
 
-        // Load the plugin manager
-        _kiwi.global.plugins = new _kiwi.model.PluginManager();
-
-        // Set up the settings datastore
-        _kiwi.global.settings = _kiwi.model.DataStore.instance('kiwi.settings');
-        _kiwi.global.settings.load();
-
         continueStart = function (locale, s, xhr) {
             if (locale) {
                 _kiwi.global.i18n = new Jed({locale_data: locale, domain: xhr.getResponseHeader('Content-Language')});
@@ -130,9 +123,16 @@ _kiwi.global = {
             // Start the client up
             _kiwi.app.start();
 
+            // Now everything has started up, load the plugin manager for third party plugins
+            _kiwi.global.plugins = new _kiwi.model.PluginManager();
+
             callback && callback();
         };
 
+        // Set up the settings datastore
+        _kiwi.global.settings = _kiwi.model.DataStore.instance('kiwi.settings');
+        _kiwi.global.settings.load();
+
         locale = _kiwi.global.settings.get('locale');
         if (!locale) {
             $.getJSON(opts.base_path + '/assets/locales/magic.json', continueStart);
diff --git a/client/src/models/pluginmanager.js b/client/src/models/pluginmanager.js
index e3fc829..7a5181b 100644
--- a/client/src/models/pluginmanager.js
+++ b/client/src/models/pluginmanager.js
@@ -1,6 +1,7 @@
 _kiwi.model.PluginManager = Backbone.Model.extend({
     initialize: function () {
-        this.$plugin_holder = $('<div id="kiwi_plugins" style="display:none;"></div>').appendTo('#kiwi');
+        this.$plugin_holder = $('<div id="kiwi_plugins" style="display:none;"></div>')
+            .appendTo(_kiwi.app.view.$el);
         this.loaded_plugins = {};
     },
 
-- 
2.25.1