Merge pull request #54 from ProWorksCorporation/v13/main

V13/main
ProWorksCorporation · Sep 11, 2024 · c310b33 · c310b33
2 parents 0725dbb + 38c3507
commit c310b33
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...yMCE.Umbraco.Premium/wwwroot/App_Plugins/TinyMCE.Umbraco.Premium/premuim.rte.component.js b/...yMCE.Umbraco.Premium/wwwroot/App_Plugins/TinyMCE.Umbraco.Premium/premuim.rte.component.js
@@ -233,11 +233,6 @@
                     ////////////////////////////////
                     var standardConfigKeys = _.keys(standardConfig);
 
-                    // Override with prevalue custom config if present
-                    if (editorConfig.customConfig) {
-                        Utilities.extend(standardConfig, editorConfig.customConfig);
-                    }
-
                     // Override with prevalue plugins if present
                     if (editorConfig.plugins) {
                         standardConfig.plugins = _.union(standardConfig.plugins, editorConfig.plugins);
@@ -275,6 +270,11 @@
                         Utilities.extend(standardConfig, window.tinymcepremium.Config.custom_user_config);
                     }
 
+                    // Override with prevalue custom config if present
+                    if (editorConfig.customConfig) {
+                        Utilities.extend(standardConfig, editorConfig.customConfig);
+                    }
+
                     if (standardConfig.plugins.indexOf("powerpaste")) {
                         // remove the "paste" plugin per TinyMCE docs
                         standardConfig.plugins = _.without(standardConfig.plugins, "paste");