X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=docs%2Fsrc%2FRoo_htmleditor_BlockFigure.js.html;h=ae287070f6effc7f0b41621184ec899e33e380ba;hb=472ea1a8d062fcbbafa729cf32b0135ded36dec1;hp=c2ef000f28f203d5f145f17e9be3bef35e7c4b98;hpb=051235a7d5b5adfab1e0279bc2d0d9d5e2d197ab;p=roojs1
diff --git a/docs/src/Roo_htmleditor_BlockFigure.js.html b/docs/src/Roo_htmleditor_BlockFigure.js.html
index c2ef000f28..ae287070f6 100644
--- a/docs/src/Roo_htmleditor_BlockFigure.js.html
+++ b/docs/src/Roo_htmleditor_BlockFigure.js.html
@@ -179,6 +179,7 @@
data : [
['auto'],
['50%'],
+ ['80%'],
['100%']
],
fields : [ 'val'],
@@ -233,7 +234,10 @@
pressed : false,
enableToggle : true,
setValue : function(v) {
- this.toggle(v == 'block' ? false : true);
+ this.setText(v ? "Hide Caption" : "Show Caption");
+ this.setPressed(v != 'block');
},
listeners : {
toggle: function (btn, state)
@@ -261,18 +265,18 @@
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 = {
tag : 'img',
contenteditable : 'false',
src : this.image_src,
alt : d.innerText.replace(/\n/g, " ").replace(/\s+/g, ' ').trim(), style: {
- width : 'auto',
- 'max-width': '100%',
- margin : '0px'
-
+ width : iw,
+ maxWidth : iw + ' !important', margin : m
}
};
@@ -311,20 +315,23 @@
};
}
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 {
+ var ret = {
tag: 'figure',
'data-block' : 'Figure',
+
contenteditable : 'false',
style : {
display: 'block',
float : this.align ,
- 'max-width': this.width,
- width : 'auto',
- margin: m,
- padding: '10px'
+ maxWidth : this.align == 'center' ? '100% !important' : (this.width + ' !important'),
+ width : this.align == 'center' ? '100%' : this.width,
+ margin: '0px',
+ padding: this.align == 'center' ? '0' : '0 10px' ,
+ textAlign : this.align },
@@ -335,27 +342,44 @@
{
tag: 'figcaption',
-
+ 'data-display' : this.caption_display,
style : {
- 'text-align': 'left',
- 'margin-top' : '16px',
- 'font-size' : '16px',
- 'line-height' : '24px',
- display : this.caption_display
+ textAlign : 'left',
+ fontSize : '16px',
+ lineHeight : '24px',
+ display : this.caption_display,
+ maxWidth : this.width + ' !important',
+ margin: m,
+ width: this.width
+
+
},
cls : this.cls.length > 0 ? (this.cls + '-thumbnail' ) : '',
cn : [
{
- tag : 'i',
- contenteditable : true,
- html : captionhtml
- }
+ tag: 'div',
+ style : {
+ marginTop : '16px',
+ textAlign : 'left'
+ },
+ align: 'left',
+ cn : [
+ {
+ tag : 'i',
+ contenteditable : true,
+ html : captionhtml
+ }
+
+ ]
+ }
+
]
}
]
};
+ return ret;
},
@@ -370,14 +394,15 @@
this.image_src = this.getVal(node, 'img', 'src');
this.align = this.getVal(node, 'figure', 'align');
- this.caption = this.getVal(node, 'figcaption', 'html');
- if (this.caption.trim().match(/^<i[^>]*>/i)) {
- this.caption = this.caption.trim().replace(/^<i[^>]*>/i, '').replace(/^<\/i>$/i, '');
+ var figcaption = this.getVal(node, 'figcaption', false);
+ if (figcaption !== '') {
+ this.caption = this.getVal(figcaption, 'i', 'html');
}
- this.caption_display = this.getVal(node, 'figcaption', 'style', 'display');
+
+
+ this.caption_display = this.getVal(node, 'figcaption', 'data-display');
this.width = this.getVal(node, 'figure', 'style', 'max-width');
+ this.width = this.getVal(node, 'figcaption', 'style', 'width');
},