fix #7771 - prefer the caption content for the value, over the data-caption value

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 36753f3..9de4f7f 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -29788,7 +29788,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
 
         this.caption_display = this.getVal(node, 'figcaption', 'data-display');
         var dc = this.getVal(node, true, 'data-caption');
-        if (dc && dc.length) {
+        if (this.caption_display == 'none' && figcaption != '' && dc && dc.length) {
             this.caption = dc;
         }
         //this.text_align = this.getVal(node, 'figcaption', 'style','text-align');
@@ -31065,7 +31065,7 @@ Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
  * LGPL
  *
  */
-
+ 
 /**
  * @class Roo.HtmlEditorCore
  * @extends Roo.Component