add simple interval support to Date.getElapsed()

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 9cca7ea..3656b8c 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -27152,6 +27152,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
                     data : [
                         ['auto'],
                         ['50%'],
+                        ['80%'],
                         ['100%']
                     ],
                     fields : [ 'val'],
@@ -27234,7 +27235,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 =   {
@@ -29245,7 +29246,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});