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 bec23f9..d639073 100644 (file)
--- a/Roo/htmleditor/BlockFigure.js
+++ b/Roo/htmleditor/BlockFigure.js
@@ -399,26 +399,32 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         this.align = this.getVal(node, 'figure', 'align');
 
         // data-display is stored in figure
-        this.caption_display = this.getVal(node, 'figure', 'data-display');
+        this.caption_display = this.getVal(node, true, 'data-display');
+        Roo.log('CAPTION DISPLAY');
+        Roo.log(this.caption_display);
 
         // backward compatible
         // it was stored in figcaption
         if(this.caption_display == '') {
             this.caption_display = this.getVal(node, 'figcaption', 'data-display');
+            Roo.log(this.caption_display);
         }
 
+        // read caption from figcaption
         var figcaption = this.getVal(node, 'figcaption', false);
-        Roo.log('FIGCAPTION');
-        Roo.log(figcaption);
+        Roo.log('CAPTION');
 
         if (figcaption !== '') {
             this.caption = this.getVal(figcaption, 'i', 'html');
+            Roo.log(this.caption);
         }
                 
 
+        // read caption from data-caption in figure if empty figcaption
         var dc = this.getVal(node, true, 'data-caption');
         if (this.caption_display == 'none' && figcaption != '' && dc && dc.length) {
             this.caption = dc;
+            Roo.log(this.caption);
         }
         //this.text_align = this.getVal(node, 'figcaption', 'style','text-align');
         this.width = this.getVal(node, true, 'data-width');

diff --git a/roojs-all.js b/roojs-all.js
index b30fb54..d5ff573 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -2016,9 +2016,10 @@ A.editorcore.onEditorEvent();}},xns:C.Toolbar}];},toObject:function(){var d=docu
 var C={tag:'figure','data-block':'Figure','data-width':this.width,'data-caption':this.caption,contenteditable:'false',style:{display:'block',float:this.align,maxWidth:this.align=='center'?'100% !important':(this.width+' !important'),width:this.align=='center'?'100%':this.width,margin:'0px',padding:this.align=='center'?'0':'0 10px',textAlign:this.align}
 ,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');this.caption_display=this.getVal(A,'figure','data-display');if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');
-}var B=this.getVal(A,'figcaption',false);Roo.log('FIGCAPTION');Roo.log(B);if(B!==''){this.caption=this.getVal(B,'i','html');}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});
+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-display');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 B=this.getVal(A,'figcaption',false);Roo.log('CAPTION');if(B!==''){this.caption=this.getVal(B,'i','html');Roo.log(this.caption);
+}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&B!=''&&dc&&dc.length){this.caption=dc;Roo.log(this.caption);}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-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 06195ab..11f8a40 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -29781,26 +29781,32 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         this.align = this.getVal(node, 'figure', 'align');
 
         // data-display is stored in figure
-        this.caption_display = this.getVal(node, 'figure', 'data-display');
+        this.caption_display = this.getVal(node, true, 'data-display');
+        Roo.log('CAPTION DISPLAY');
+        Roo.log(this.caption_display);
 
         // backward compatible
         // it was stored in figcaption
         if(this.caption_display == '') {
             this.caption_display = this.getVal(node, 'figcaption', 'data-display');
+            Roo.log(this.caption_display);
         }
 
+        // read caption from figcaption
         var figcaption = this.getVal(node, 'figcaption', false);
-        Roo.log('FIGCAPTION');
-        Roo.log(figcaption);
+        Roo.log('CAPTION');
 
         if (figcaption !== '') {
             this.caption = this.getVal(figcaption, 'i', 'html');
+            Roo.log(this.caption);
         }
                 
 
+        // read caption from data-caption in figure if empty figcaption
         var dc = this.getVal(node, true, 'data-caption');
         if (this.caption_display == 'none' && figcaption != '' && dc && dc.length) {
             this.caption = dc;
+            Roo.log(this.caption);
         }
         //this.text_align = this.getVal(node, 'figcaption', 'style','text-align');
         this.width = this.getVal(node, true, 'data-width');

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index d1371dd..7e4f69a 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1290,9 +1290,10 @@ A.editorcore.onEditorEvent();}},xns:C.Toolbar}];},toObject:function(){var d=docu
 var C={tag:'figure','data-block':'Figure','data-width':this.width,'data-caption':this.caption,contenteditable:'false',style:{display:'block',float:this.align,maxWidth:this.align=='center'?'100% !important':(this.width+' !important'),width:this.align=='center'?'100%':this.width,margin:'0px',padding:this.align=='center'?'0':'0 10px',textAlign:this.align}
 ,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');this.caption_display=this.getVal(A,'figure','data-display');if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');
-}var B=this.getVal(A,'figcaption',false);Roo.log('FIGCAPTION');Roo.log(B);if(B!==''){this.caption=this.getVal(B,'i','html');}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});
+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-display');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 B=this.getVal(A,'figcaption',false);Roo.log('CAPTION');if(B!==''){this.caption=this.getVal(B,'i','html');Roo.log(this.caption);
+}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&B!=''&&dc&&dc.length){this.caption=dc;Roo.log(this.caption);}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 4aaadc3..8a3d9cc 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -48674,26 +48674,32 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         this.align = this.getVal(node, 'figure', 'align');
 
         // data-display is stored in figure
-        this.caption_display = this.getVal(node, 'figure', 'data-display');
+        this.caption_display = this.getVal(node, true, 'data-display');
+        Roo.log('CAPTION DISPLAY');
+        Roo.log(this.caption_display);
 
         // backward compatible
         // it was stored in figcaption
         if(this.caption_display == '') {
             this.caption_display = this.getVal(node, 'figcaption', 'data-display');
+            Roo.log(this.caption_display);
         }
 
+        // read caption from figcaption
         var figcaption = this.getVal(node, 'figcaption', false);
-        Roo.log('FIGCAPTION');
-        Roo.log(figcaption);
+        Roo.log('CAPTION');
 
         if (figcaption !== '') {
             this.caption = this.getVal(figcaption, 'i', 'html');
+            Roo.log(this.caption);
         }
                 
 
+        // read caption from data-caption in figure if empty figcaption
         var dc = this.getVal(node, true, 'data-caption');
         if (this.caption_display == 'none' && figcaption != '' && dc && dc.length) {
             this.caption = dc;
+            Roo.log(this.caption);
         }
         //this.text_align = this.getVal(node, 'figcaption', 'style','text-align');
         this.width = this.getVal(node, true, 'data-width');

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index abc71cf..e90d72d 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -24172,26 +24172,32 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         this.align = this.getVal(node, 'figure', 'align');
 
         // data-display is stored in figure
-        this.caption_display = this.getVal(node, 'figure', 'data-display');
+        this.caption_display = this.getVal(node, true, 'data-display');
+        Roo.log('CAPTION DISPLAY');
+        Roo.log(this.caption_display);
 
         // backward compatible
         // it was stored in figcaption
         if(this.caption_display == '') {
             this.caption_display = this.getVal(node, 'figcaption', 'data-display');
+            Roo.log(this.caption_display);
         }
 
+        // read caption from figcaption
         var figcaption = this.getVal(node, 'figcaption', false);
-        Roo.log('FIGCAPTION');
-        Roo.log(figcaption);
+        Roo.log('CAPTION');
 
         if (figcaption !== '') {
             this.caption = this.getVal(figcaption, 'i', 'html');
+            Roo.log(this.caption);
         }
                 
 
+        // read caption from data-caption in figure if empty figcaption
         var dc = this.getVal(node, true, 'data-caption');
         if (this.caption_display == 'none' && figcaption != '' && dc && dc.length) {
             this.caption = dc;
+            Roo.log(this.caption);
         }
         //this.text_align = this.getVal(node, 'figcaption', 'style','text-align');
         this.width = this.getVal(node, true, 'data-width');

diff --git a/roojs-ui.js b/roojs-ui.js
index 92363b7..1aa6815 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1069,9 +1069,10 @@ A.editorcore.onEditorEvent();}},xns:C.Toolbar}];},toObject:function(){var d=docu
 var C={tag:'figure','data-block':'Figure','data-width':this.width,'data-caption':this.caption,contenteditable:'false',style:{display:'block',float:this.align,maxWidth:this.align=='center'?'100% !important':(this.width+' !important'),width:this.align=='center'?'100%':this.width,margin:'0px',padding:this.align=='center'?'0':'0 10px',textAlign:this.align}
 ,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');this.caption_display=this.getVal(A,'figure','data-display');if(this.caption_display==''){this.caption_display=this.getVal(A,'figcaption','data-display');
-}var B=this.getVal(A,'figcaption',false);Roo.log('FIGCAPTION');Roo.log(B);if(B!==''){this.caption=this.getVal(B,'i','html');}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});
+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-display');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 B=this.getVal(A,'figcaption',false);Roo.log('CAPTION');if(B!==''){this.caption=this.getVal(B,'i','html');Roo.log(this.caption);
+}var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&B!=''&&dc&&dc.length){this.caption=dc;Roo.log(this.caption);}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;