Roo/htmleditor/BlockFigure.js

diff --git a/Roo/htmleditor/BlockFigure.js b/Roo/htmleditor/BlockFigure.js
index cb9f64d..c30d1ef 100644 (file)
--- a/Roo/htmleditor/BlockFigure.js
+++ b/Roo/htmleditor/BlockFigure.js
@@ -422,7 +422,8 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
 
         // read caption from data-caption in figure if empty figcaption
         var dc = this.getVal(node, true, 'data-caption');
-        if (this.caption_display == 'none' && figcaption != '' && dc && dc.length) {
+        // if (this.caption_display == 'none' && figcaption != '' && dc && dc.length) {
+        if(this.caption == '' && dc && dc.length){
             this.caption = dc;
             Roo.log(this.caption);
         }