From fefded6922359b5a84f549588d41863e815a8361 Mon Sep 17 00:00:00 2001
From: leon <leon@roojs.com>
Date: Wed, 1 Mar 2023 12:31:58 +0800
Subject: [PATCH] Roo/htmleditor/BlockFigure.js roojs-bootstrap.js
 roojs-bootstrap-debug.js

---
 roojs-bootstrap-debug.js | 2 +-
 roojs-bootstrap.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index c7b99c4262..acd4889e03 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -29510,7 +29510,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         
 
         this.caption_display = this.getVal(node, 'figcaption', 'data-display');
-        var dc = this.getVal(node, 'figcaption', 'data-caption');
+        var dc = this.getVal(node, true, 'data-caption');
         if (dc && dc.length) {
             this.caption = dc;
         }
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 8558bb9ad2..f79404aaaa 100644
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1274,7 +1274,7 @@ var C={tag:'figure','data-block':'Figure','data-width':this.width,'data-caption'
 ,align:this.align,cn:[A,{tag:'figcaption','data-display':this.caption_display,style:{textAlign:'left',fontSize:'16px',lineHeight:'24px',display:this.caption_display,maxWidth:(this.align=='center'?this.width:'100%')+' !important',margin:m,width:this.align=='center'?this.width:'100%'}
 ,cls:this.cls.length>0?(this.cls+'-thumbnail'):'',cn:[{tag:'div',style:{marginTop:'16px',textAlign:'left'},align:'left',cn:[{tag:'i',contenteditable:true,html:B}]}]}]};return C;},readElement:function(A){this.video_url=this.getVal(A,'div','src');this.cls=this.getVal(A,'div','class');
 this.href=this.getVal(A,'a','href');this.image_src=this.getVal(A,'img','src');this.align=this.getVal(A,'figure','align');var B=this.getVal(A,'figcaption',false);if(B!==''){this.caption=this.getVal(B,'i','html');}this.caption_display=this.getVal(A,'figcaption','data-display');
-var dc=this.getVal(A,'figcaption','data-caption');if(dc&&dc.length){this.caption=dc;}this.width=this.getVal(A,true,'data-width');},removeNode:function(){return this.node;}})
+var dc=this.getVal(A,true,'data-caption');if(dc&&dc.length){this.caption=dc;}this.width=this.getVal(A,true,'data-width');},removeNode:function(){return this.node;}})
 // Roo/htmleditor/BlockTable.js
 Roo.htmleditor.BlockTable=function(A){if(A.node){this.readElement(A.node);this.updateElement(A.node);}Roo.apply(this,A);if(!A.node){this.rows=[];for(var r=0;r<this.no_row;r++){this.rows[r]=[];for(var c=0;c<this.no_col;c++){this.rows[r][c]=this.emptyCell();
 }}}};Roo.extend(Roo.htmleditor.BlockTable,Roo.htmleditor.Block,{rows:false,no_col:1,no_row:1,width:'100%',friendly_name:'Table',deleteTitle:'Delete Table',contextMenu:function(A){var B=function(){return Roo.htmleditor.Block.factory(A.tb.selectedNode);};var C=typeof(Roo.bootstrap)=='undefined'?Roo:Roo.bootstrap;
-- 
2.39.2