Roo/htmleditor/BlockFigure.js

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

diff --git a/Roo/htmleditor/BlockFigure.js b/Roo/htmleditor/BlockFigure.js
index 5d7f98f..238d129 100644 (file)
--- a/Roo/htmleditor/BlockFigure.js
+++ b/Roo/htmleditor/BlockFigure.js
@@ -410,6 +410,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         Roo.log(this.caption_display);
         if(this.caption_display == '') {
             this.caption_display = this.getVal(node, 'figcaption', 'data-display');
+            Roo.log(this.caption_display);
         }
 
         var dc = this.getVal(node, true, 'data-caption');

diff --git a/roojs-all.js b/roojs-all.js
index b1ec437..d99316a 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -2017,7 +2017,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:Roo.htmleditor.BlockFigure.caption_edit,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,'figure','data-display');
-Roo.log('CAPTION DISPLAY');Roo.log(this.caption_display);if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&B!=''&&dc&&dc.length){this.caption=dc;
+Roo.log('CAPTION DISPLAY');Roo.log(this.caption_display);if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');Roo.log(this.caption_display);}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&B!=''&&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();

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 2e9b041..ee4bfef 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -29792,6 +29792,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         Roo.log(this.caption_display);
         if(this.caption_display == '') {
             this.caption_display = this.getVal(node, 'figcaption', 'data-display');
+            Roo.log(this.caption_display);
         }
 
         var dc = this.getVal(node, true, 'data-caption');

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 0698406..0dde067 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1291,7 +1291,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:Roo.htmleditor.BlockFigure.caption_edit,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,'figure','data-display');
-Roo.log('CAPTION DISPLAY');Roo.log(this.caption_display);if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&B!=''&&dc&&dc.length){this.caption=dc;
+Roo.log('CAPTION DISPLAY');Roo.log(this.caption_display);if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');Roo.log(this.caption_display);}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&B!=''&&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();

diff --git a/roojs-debug.js b/roojs-debug.js
index c2d623a..935f3e7 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -48685,6 +48685,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         Roo.log(this.caption_display);
         if(this.caption_display == '') {
             this.caption_display = this.getVal(node, 'figcaption', 'data-display');
+            Roo.log(this.caption_display);
         }
 
         var dc = this.getVal(node, true, 'data-caption');

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 859f8ee..6607749 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -24183,6 +24183,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         Roo.log(this.caption_display);
         if(this.caption_display == '') {
             this.caption_display = this.getVal(node, 'figcaption', 'data-display');
+            Roo.log(this.caption_display);
         }
 
         var dc = this.getVal(node, true, 'data-caption');

diff --git a/roojs-ui.js b/roojs-ui.js
index be81fc2..7d1daf2 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1070,7 +1070,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:Roo.htmleditor.BlockFigure.caption_edit,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,'figure','data-display');
-Roo.log('CAPTION DISPLAY');Roo.log(this.caption_display);if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&B!=''&&dc&&dc.length){this.caption=dc;
+Roo.log('CAPTION DISPLAY');Roo.log(this.caption_display);if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');Roo.log(this.caption_display);}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&B!=''&&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();