X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-bootstrap-debug.js;h=fd34b3d4de508d0ccab2135355b9299cc93a516d;hb=9ea1acba83952bd78bc099d6897a9c904cd189f8;hp=2f35e102e2595378eb93d213473c4b9584654063;hpb=4ed79f6289ef64f2f5b81ce2f0816e9883777ec0;p=roojs1 diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 2f35e102e2..fd34b3d4de 100644 --- 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});