From c94c7542ca7bdf78f356896bacf7496d3e72cd9b Mon Sep 17 00:00:00 2001 From: Alan Date: Wed, 16 Mar 2022 14:11:25 +0800 Subject: [PATCH] Changed Roo/HtmlEditorCore.jsRoo/htmleditor/BlockFigure.js --- Roo/HtmlEditorCore.js | 1 + Roo/htmleditor/BlockFigure.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Roo/HtmlEditorCore.js b/Roo/HtmlEditorCore.js index c79217340a..c7cfbccaea 100644 --- a/Roo/HtmlEditorCore.js +++ b/Roo/HtmlEditorCore.js @@ -629,6 +629,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { new Roo.htmleditor.FilterParagraph({ node : d }); new Roo.htmleditor.FilterSpan({ node : d }); new Roo.htmleditor.FilterLongBr({ node : d }); + new Roo.htmleditor.FilterComment({ node : d }); } if (this.enableBlocks) { diff --git a/Roo/htmleditor/BlockFigure.js b/Roo/htmleditor/BlockFigure.js index b7f3fc61da..814a7fe6f9 100644 --- a/Roo/htmleditor/BlockFigure.js +++ b/Roo/htmleditor/BlockFigure.js @@ -395,7 +395,10 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { this.align = this.getVal(node, 'figure', 'align'); var figcaption = this.getVal(node, 'figcaption', false); - this.caption = this.getVal(figcaption, 'i', 'html'); + if (figcaption !== false) { + this.caption = this.getVal(figcaption, 'i', 'html'); + } + this.caption_display = this.getVal(node, 'figcaption', 'data-display'); //this.text_align = this.getVal(node, 'figcaption', 'style','text-align'); -- 2.39.2