roojs-core.js

roojs-core-debug.js
roojs-ui.js
roojs-ui-debug.js
roojs-all.js
roojs-debug.js

diff --git a/roojs-all.js b/roojs-all.js
index 4aa3dbe..901b458 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -2019,9 +2019,9 @@ A.editorcore.onEditorEvent();}},xns:C.Toolbar},{xtype:'ComboBox',allowBlank:fals
 ,align:this.align,cn:[A]};if(this.caption_display=='block'){B['cn'].push({tag:'figcaption',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:this.width=='100%'?this.caption_align:'left'},align:'left',cn:[{tag:'i',contenteditable:Roo.htmleditor.BlockFigure.caption_edit,html:this.caption.length?this.caption:"Caption"}
 ]}]});}return B;},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');this.caption_display=this.getVal(A,true,'data-caption-display');
-if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');}this.caption_align=this.getVal(A,'figcaption','data-caption-align');Roo.log('READ CAPTION ALIGN');Roo.log(this.caption_align);var B=this.getVal(A,'figcaption',false);
-if(B!==''){this.caption=this.getVal(B,'i','html');}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&dc&&dc.length){this.caption=dc;}this.width=this.getVal(A,true,'data-width');},removeNode:function(){return this.node;}});Roo.apply(Roo.htmleditor.BlockFigure,{caption_edit:true}
-);
+if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');}this.caption_align=this.getVal(A,true,'data-caption-align');Roo.log('READ CAPTION ALIGN');Roo.log(this.caption_align);var B=this.getVal(A,'figcaption',false);if(B!==''){this.caption=this.getVal(B,'i','html');
+}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&dc&&dc.length){this.caption=dc;}this.width=this.getVal(A,true,'data-width');},removeNode:function(){return this.node;}});Roo.apply(Roo.htmleditor.BlockFigure,{caption_edit:true});
+
 // 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;

diff --git a/roojs-debug.js b/roojs-debug.js
index 3d35c81..ff248fe 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -48732,7 +48732,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
             this.caption_display = this.getVal(node, 'figcaption', 'data-display');
         }
 
-        this.caption_align = this.getVal(node, 'figcaption', 'data-caption-align');
+        this.caption_align = this.getVal(node, true, 'data-caption-align');
 
         Roo.log('READ CAPTION ALIGN');
         Roo.log(this.caption_align);

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 006180b..818a6fa 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -24230,7 +24230,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
             this.caption_display = this.getVal(node, 'figcaption', 'data-display');
         }
 
-        this.caption_align = this.getVal(node, 'figcaption', 'data-caption-align');
+        this.caption_align = this.getVal(node, true, 'data-caption-align');
 
         Roo.log('READ CAPTION ALIGN');
         Roo.log(this.caption_align);

diff --git a/roojs-ui.js b/roojs-ui.js
index c36e4af..59ce160 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1072,9 +1072,9 @@ A.editorcore.onEditorEvent();}},xns:C.Toolbar},{xtype:'ComboBox',allowBlank:fals
 ,align:this.align,cn:[A]};if(this.caption_display=='block'){B['cn'].push({tag:'figcaption',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:this.width=='100%'?this.caption_align:'left'},align:'left',cn:[{tag:'i',contenteditable:Roo.htmleditor.BlockFigure.caption_edit,html:this.caption.length?this.caption:"Caption"}
 ]}]});}return B;},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');this.caption_display=this.getVal(A,true,'data-caption-display');
-if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');}this.caption_align=this.getVal(A,'figcaption','data-caption-align');Roo.log('READ CAPTION ALIGN');Roo.log(this.caption_align);var B=this.getVal(A,'figcaption',false);
-if(B!==''){this.caption=this.getVal(B,'i','html');}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&dc&&dc.length){this.caption=dc;}this.width=this.getVal(A,true,'data-width');},removeNode:function(){return this.node;}});Roo.apply(Roo.htmleditor.BlockFigure,{caption_edit:true}
-);
+if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');}this.caption_align=this.getVal(A,true,'data-caption-align');Roo.log('READ CAPTION ALIGN');Roo.log(this.caption_align);var B=this.getVal(A,'figcaption',false);if(B!==''){this.caption=this.getVal(B,'i','html');
+}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&dc&&dc.length){this.caption=dc;}this.width=this.getVal(A,true,'data-width');},removeNode:function(){return this.node;}});Roo.apply(Roo.htmleditor.BlockFigure,{caption_edit:true});
+
 // 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;