Roo/htmleditor/BlockFigure.js

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