From 1487a1c9ea2614e3234d190c05eff4c50d5e2ca9 Mon Sep 17 00:00:00 2001 From: Nadira Yasmeen Date: Thu, 14 May 2020 10:05:08 -0700 Subject: [PATCH] Fixes issue where new elements didn't load simple classes in dialogs hannonhill/Cascade#3915 --- src/plugins/image/src/main/js/ui/Dialog.js | 5 +++-- src/plugins/link/src/main/js/ui/Dialog.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/image/src/main/js/ui/Dialog.js b/src/plugins/image/src/main/js/ui/Dialog.js index b1ddbae78c7..b13aa21b43e 100644 --- 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 index 1093421024e..d413fe5045d 100644 --- 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) {