Fixes issue where new elements didn't load simple classes in dialogs …

…hannonhill/Cascade#3915
hannonhill · May 14, 2020 · 1487a1c · 1487a1c
1 parent 4c887b6
commit 1487a1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/plugins/image/src/main/js/ui/Dialog.js b/src/plugins/image/src/main/js/ui/Dialog.js
@@ -683,10 +683,11 @@ define(
         }
 
         var formatContainerHtml = '';
+        var classList = Settings.getClassList(editor);
         if (customStyleFormatsList.length) {
           formatContainerHtml = CustomStyleFormatsUtils.generateFormatMultiSelectHtml(customStyleFormatsList, data['class'], 'img', editor);
-        } else if (data['class']) {
-          formatContainerHtml = CustomStyleFormatsUtils.generateClassMultiSelectHtml(Settings.getClassList(editor), data['class']);
+        } else if (classList.length) {
+          formatContainerHtml = CustomStyleFormatsUtils.generateClassMultiSelectHtml(classList, data['class']);
         }
 
         if (formatContainerHtml.length) {

diff --git a/src/plugins/link/src/main/js/ui/Dialog.js b/src/plugins/link/src/main/js/ui/Dialog.js
@@ -362,10 +362,11 @@ define(
       }
 
       var formatContainerHtml = '';
+      var classList = Settings.getLinkClassList(editor.settings);
       if (customStyleFormatsList.length) {
         formatContainerHtml = CustomStyleFormatsUtils.generateFormatMultiSelectHtml(customStyleFormatsList, data['class'], 'a', editor);
-      } else if (data['class']) {
-        formatContainerHtml = CustomStyleFormatsUtils.generateClassMultiSelectHtml(Settings.getLinkClassList(editor.settings), data['class']);
+      } else if (classList.length) {
+        formatContainerHtml = CustomStyleFormatsUtils.generateClassMultiSelectHtml(classList, data['class']);
       }
 
       if (formatContainerHtml.length) {