roojs-core.js

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

diff --git a/roojs-all.js b/roojs-all.js
index 8d7b233..f5a072f 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -2015,10 +2015,10 @@ A.editorcore.onEditorEvent();}},xns:C.Toolbar}];},toObject:function(){var d=docu
 };if(this.href.length>0){A={tag:'a',href:this.href,contenteditable:'true',cn:[A]};}if(this.video_url.length>0){A={tag:'div',cls:this.cls,frameborder:0,allowfullscreen:true,width:420,height:315,src:this.video_url,cn:[A]};}var B={tag:'figure','data-block':'Figure','data-width':this.width,'data-caption':this.caption,'data-caption-display':this.caption_display,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]};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:'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');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('FIGCAPTION');
-}Roo.log(this.caption);var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&this.caption==''&&dc&&dc.length){this.caption=dc;Roo.log('DATA CAPTION');}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});
+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');Roo.log('CAPTION DISPLAY');Roo.log(A);
+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('FIGCAPTION');}Roo.log(this.caption);var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&this.caption==''&&dc&&dc.length){this.caption=dc;Roo.log('DATA CAPTION');}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 d0d73fa..ccc1575 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -29783,6 +29783,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         // caption display is stored in figure
         this.caption_display = this.getVal(node, true, 'data-caption-display');
         Roo.log('CAPTION DISPLAY');
+        Roo.log(node);
         Roo.log(this.caption_display);
 
         // backward compatible

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 9c3ba91..bff1fae 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1289,10 +1289,10 @@ A.editorcore.onEditorEvent();}},xns:C.Toolbar}];},toObject:function(){var d=docu
 };if(this.href.length>0){A={tag:'a',href:this.href,contenteditable:'true',cn:[A]};}if(this.video_url.length>0){A={tag:'div',cls:this.cls,frameborder:0,allowfullscreen:true,width:420,height:315,src:this.video_url,cn:[A]};}var B={tag:'figure','data-block':'Figure','data-width':this.width,'data-caption':this.caption,'data-caption-display':this.caption_display,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]};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:'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');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('FIGCAPTION');
-}Roo.log(this.caption);var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&this.caption==''&&dc&&dc.length){this.caption=dc;Roo.log('DATA CAPTION');}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});
+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');Roo.log('CAPTION DISPLAY');Roo.log(A);
+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('FIGCAPTION');}Roo.log(this.caption);var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&this.caption==''&&dc&&dc.length){this.caption=dc;Roo.log('DATA CAPTION');}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 4eb4de0..5ca3af2 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -48676,6 +48676,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         // caption display is stored in figure
         this.caption_display = this.getVal(node, true, 'data-caption-display');
         Roo.log('CAPTION DISPLAY');
+        Roo.log(node);
         Roo.log(this.caption_display);
 
         // backward compatible

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 4c5326e..e4c248c 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -24174,6 +24174,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         // caption display is stored in figure
         this.caption_display = this.getVal(node, true, 'data-caption-display');
         Roo.log('CAPTION DISPLAY');
+        Roo.log(node);
         Roo.log(this.caption_display);
 
         // backward compatible

diff --git a/roojs-ui.js b/roojs-ui.js
index eb40130..a5b1beb 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1068,10 +1068,10 @@ A.editorcore.onEditorEvent();}},xns:C.Toolbar}];},toObject:function(){var d=docu
 };if(this.href.length>0){A={tag:'a',href:this.href,contenteditable:'true',cn:[A]};}if(this.video_url.length>0){A={tag:'div',cls:this.cls,frameborder:0,allowfullscreen:true,width:420,height:315,src:this.video_url,cn:[A]};}var B={tag:'figure','data-block':'Figure','data-width':this.width,'data-caption':this.caption,'data-caption-display':this.caption_display,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]};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:'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');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('FIGCAPTION');
-}Roo.log(this.caption);var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&this.caption==''&&dc&&dc.length){this.caption=dc;Roo.log('DATA CAPTION');}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});
+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');Roo.log('CAPTION DISPLAY');Roo.log(A);
+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('FIGCAPTION');}Roo.log(this.caption);var dc=this.getVal(A,true,'data-caption');if(this.caption_display=='none'&&this.caption==''&&dc&&dc.length){this.caption=dc;Roo.log('DATA CAPTION');}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;