From 5bb2c43dd076d9f7fdf93f8f11be1768d77e65fa Mon Sep 17 00:00:00 2001
From: chylex <contact@chylex.com>
Date: Sat, 28 Apr 2018 15:22:55 +0200
Subject: [PATCH] Fix edit-design plugin not loading when enabled after a
restart
---
Resources/Plugins/edit-design/browser.js | 38 ++++++++++++------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/Resources/Plugins/edit-design/browser.js b/Resources/Plugins/edit-design/browser.js
index 705087eb..a243af72 100644
--- a/Resources/Plugins/edit-design/browser.js
+++ b/Resources/Plugins/edit-design/browser.js
@@ -21,6 +21,22 @@ enabled(){
avatarRadius: 2
};
+ var prepareDefaultConfig = () => {
+ this.defaultConfig._theme = TD.settings.getTheme();
+
+ switch(TD.settings.getColumnWidth()){
+ case "wide": this.defaultConfig.columnWidth = "350px"; break;
+ case "narrow": this.defaultConfig.columnWidth = "270px"; break;
+ }
+
+ switch(TD.settings.getFontSize()){
+ case "small": this.defaultConfig.fontSize = "13px"; break;
+ case "medium": this.defaultConfig.fontSize = "14px"; break;
+ case "large": this.defaultConfig.fontSize = "15px"; break;
+ case "largest": this.defaultConfig.fontSize = "16px"; break;
+ }
+ };
+
this.firstTimeLoad = null;
var me = this;
@@ -45,6 +61,7 @@ enabled(){
else if (this.tmpConfig !== null){
let needsResave = !("_theme" in this.tmpConfig);
+ prepareDefaultConfig();
this.config = $.extend(this.defaultConfig, this.tmpConfig);
this.tmpConfig = null;
this.reinjectAll();
@@ -62,28 +79,11 @@ enabled(){
this.onStageReady();
};
- if (this.$$wasLoadedBefore){
+ if (TD.ready){
this.onStageReady();
}
else{
- $(document).one("dataSettingsValues", () => {
- this.defaultConfig._theme = TD.settings.getTheme();
-
- switch(TD.settings.getColumnWidth()){
- case "wide": this.defaultConfig.columnWidth = "350px"; break;
- case "narrow": this.defaultConfig.columnWidth = "270px"; break;
- }
-
- switch(TD.settings.getFontSize()){
- case "small": this.defaultConfig.fontSize = "13px"; break;
- case "medium": this.defaultConfig.fontSize = "14px"; break;
- case "large": this.defaultConfig.fontSize = "15px"; break;
- case "largest": this.defaultConfig.fontSize = "16px"; break;
- }
-
- this.$$wasLoadedBefore = true;
- this.onStageReady();
- });
+ $(document).one("dataSettingsValues", () => this.onStageReady());
}
$TDP.checkFileExists(this.$token, configFile).then(exists => {