roojs-ui.js

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 2f35e10..42c1061 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -27208,10 +27208,9 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
                 enableToggle : true,
                 setValue : function(v) {
                     // this trigger toggle.
-                    
-                    var b  = block();
-                    this.setText(b.caption_display == 'block' ? "Hide Caption" : "Show Caption");
-                    this.setPressed(b.caption_display == 'block' ? false: true);
+                     
+                    this.setText(v ? "Hide Caption" : "Show Caption");
+                    this.setPressed(!v);
                 },
                 listeners : {
                     toggle: function (btn, state)
@@ -29251,7 +29250,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', 'colspan', 'rowspan'],
+                attrib_white : ['href', 'src', 'name', 'align', 'colspan', 'rowspan', 'data-display'],
                 attrib_clean : ['href', 'src' ] 
             });
             new Roo.htmleditor.FilterBlack({ node : d, tag : this.black});