X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-debug.js;h=da256eea104720922e38c8d0efaea253c580a240;hb=049aafc0e70ae32c3d8156e6c9f320b48fc185df;hp=e4c6e1a7fba077aa3a8d6d501e4e74ad61d050cb;hpb=3cc0f894f4950c221efdc268aed5afa04b6971b2;p=roojs1

diff --git a/roojs-debug.js b/roojs-debug.js
index e4c6e1a7fb..da256eea10 100644
--- 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 =   {
@@ -50082,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});