allow table row and colspan

[roojs1] / roojs-debug.js

diff --git a/roojs-debug.js b/roojs-debug.js
index 5180972..da256ee 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -47989,6 +47989,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
                     data : [
                         ['auto'],
                         ['50%'],
+                        ['80%'],
                         ['100%']
                     ],
                     fields : [ 'val'],
@@ -48071,7 +48072,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         var d = document.createElement('div');
         d.innerHTML = this.caption;
         
-        var m = this.width == '50%' && this.align == 'center' ? '0 auto' : 0; 
+        var m = this.width != '100%' && this.align == 'center' ? '0 auto' : 0; 
         
         var iw = this.align == 'center' ? this.width : '100%';
         var img =   {
@@ -48136,7 +48137,8 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
                 maxWidth :  this.align == 'center' ? '100% !important' : (this.width + ' !important'),
                 width : this.align == 'center' ? '100%' : this.width,
                 margin:  '0px',
-                padding: '10px'
+                padding: '10px',
+                textAlign : this.align   // seems to work for email..
                 
             },
            
@@ -48164,7 +48166,8 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
                         {
                             tag: 'div',
                             style  : {
-                                'margin-top' : '16px'
+                                marginTop : '16px',
+                                textAlign : 'left'
                             },
                             align: 'left',
                             cn : [
@@ -50080,7 +50083,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
             new Roo.htmleditor.FilterStyleToTag({ node : d });
             new Roo.htmleditor.FilterAttributes({
                 node : d,
-                attrib_white : ['href', 'src', 'name', 'align'],
+                attrib_white : ['href', 'src', 'name', 'align', 'colspan', 'rowspan'],
                 attrib_clean : ['href', 'src' ] 
             });
             new Roo.htmleditor.FilterBlack({ node : d, tag : this.black});