X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fhtmleditor%2FBlockFigure.js;h=c43f0e39945a4385aaba961fb5eecd1577d87cdd;hb=5cb025da6d12a9ec7da57c2d616452b3d255bdbe;hp=233eec4cb7dd484f75a674bfdd7b8689ded6acd4;hpb=e6d9cd3b3b2ea94cbc5346c1b89138553350de3c;p=roojs1 diff --git a/Roo/htmleditor/BlockFigure.js b/Roo/htmleditor/BlockFigure.js index 233eec4cb7..c43f0e3994 100644 --- a/Roo/htmleditor/BlockFigure.js +++ b/Roo/htmleditor/BlockFigure.js @@ -311,7 +311,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { }; } // we remove caption totally if its hidden... - will delete data.. but otherwise we end up with fake caption - var captionhtml = this.caption_display == 'hidden' ? '' : (this.caption.length ? this.caption : "Caption"); + var captionhtml = this.caption_display == 'none' ? '' : (this.caption.length ? this.caption : "Caption"); return { tag: 'figure', @@ -338,7 +338,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { 'data-display' : this.caption_display, style : { 'text-align': 'left', - 'margin-top' : '16px', + 'font-size' : '16px', 'line-height' : '24px', display : this.caption_display @@ -346,11 +346,22 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, { cls : this.cls.length > 0 ? (this.cls + '-thumbnail' ) : '', cn : [ { - // we can not rely on yahoo syndication to use CSS elements - so have to use '' to encase stuff. - tag : 'i', - contenteditable : true, - html : captionhtml + tag: 'div', + style : { + 'margin-top' : '16px' + }, + align: 'left', + cn : [ + { + // we can not rely on yahoo syndication to use CSS elements - so have to use '' to encase stuff. + tag : 'i', + contenteditable : true, + html : captionhtml + } + + ] } + ] }