From e7b0acb5a09d199942f24f5ca31dac417b1f25eb Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Thu, 8 Mar 2018 13:59:19 +0000
Subject: [PATCH] Fix plugin API basic modals

---
 client/src/modules/pluginapi.js    | 2 +-
 client/src/modules/theme.js        | 3 ++-
 client/src/modules/thememanager.js | 1 -
 tests/plugins/Example 4/index.js   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/modules/pluginapi.js b/client/src/modules/pluginapi.js
index c9529c7c..0ae6b4ff 100644
--- a/client/src/modules/pluginapi.js
+++ b/client/src/modules/pluginapi.js
@@ -264,7 +264,6 @@ export default class PluginApi {
     }
     addModal(_modal, component) {
         const modal = Modals.add(_modal, component);
-        modal.close = force => this.closeModal(modal, force);
         modal.on('close', () => {
             let index;
             while ((index = this.modalStack.findIndex(m => m === modal)) > -1)
@@ -298,6 +297,7 @@ export default class PluginApi {
             close: this.closeModal.bind(this),
             closeAll: this.closeAllModals.bind(this),
             closeLast: this.closeLastModal.bind(this),
+            basic: this.basicModal.bind(this),
             settings: this.settingsModal.bind(this)
         }, 'stack', {
             get: () => this.modalStack
diff --git a/client/src/modules/theme.js b/client/src/modules/theme.js
index bd68cef9..b02ba3ed 100644
--- a/client/src/modules/theme.js
+++ b/client/src/modules/theme.js
@@ -46,7 +46,8 @@ export default class Theme extends Content {
     /**
      * This is called when the theme is enabled.
      */
-    onstart() {
+    async onstart() {
+        if (!this.css) await this.recompile();
         DOM.injectTheme(this.css, this.id);
     }
 
diff --git a/client/src/modules/thememanager.js b/client/src/modules/thememanager.js
index 8c4bf97d..81276c5d 100644
--- a/client/src/modules/thememanager.js
+++ b/client/src/modules/thememanager.js
@@ -48,7 +48,6 @@ export default class ThemeManager extends ContentManager {
             if (instance.enabled) {
                 instance.userConfig.enabled = false;
                 instance.enable();
-                if (!instance.css) instance.recompile();
             }
             return instance;
         } catch (err) {
diff --git a/tests/plugins/Example 4/index.js b/tests/plugins/Example 4/index.js
index 38cdb3dc..d605ec9e 100644
--- a/tests/plugins/Example 4/index.js	
+++ b/tests/plugins/Example 4/index.js	
@@ -1,4 +1,4 @@
-module.exports = (Plugin, { Logger, Settings, BdMenu: { BdMenuItems }, Api }) => class extends Plugin {
+module.exports = (Plugin, { Logger, Settings, Modals, BdMenu: { BdMenuItems }, Api }) => class extends Plugin {
 	async onstart() {
 		// Some array event examples
 		const arraySetting = this.settings.getSetting('default', 'array-1');