projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use data for storing width on figure
[roojs1]
/
roojs-ui-debug.js
diff --git
a/roojs-ui-debug.js
b/roojs-ui-debug.js
index
96f3c62
..
8e4d04d
100644
(file)
--- a/
roojs-ui-debug.js
+++ b/
roojs-ui-debug.js
@@
-23563,7
+23563,6
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
store : {
xtype : 'SimpleStore',
data : [
store : {
xtype : 'SimpleStore',
data : [
- ['auto'],
['50%'],
['80%'],
['100%']
['50%'],
['80%'],
['100%']
@@
-23707,7
+23706,7
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
var ret = {
tag: 'figure',
'data-block' : 'Figure',
var ret = {
tag: 'figure',
'data-block' : 'Figure',
-
+ 'data-width' : this.width,
contenteditable : 'false',
style : {
contenteditable : 'false',
style : {
@@
-23734,9
+23733,9
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
fontSize : '16px',
lineHeight : '24px',
display : this.caption_display,
fontSize : '16px',
lineHeight : '24px',
display : this.caption_display,
- maxWidth :
this.width
+ ' !important',
+ maxWidth :
(this.align == 'center' ? this.width : '100%' )
+ ' !important',
margin: m,
margin: m,
- width: this.
width
+ width: this.
align == 'center' ? this.width : '100%'
},
},
@@
-23788,7
+23787,7
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
this.caption_display = this.getVal(node, 'figcaption', 'data-display');
//this.text_align = this.getVal(node, 'figcaption', 'style','text-align');
this.caption_display = this.getVal(node, 'figcaption', 'data-display');
//this.text_align = this.getVal(node, 'figcaption', 'style','text-align');
- this.width = this.getVal(node,
'figcaption', 'style', '
width');
+ this.width = this.getVal(node,
true, 'data-
width');
//this.margin = this.getVal(node, 'figure', 'style', 'margin');
},
//this.margin = this.getVal(node, 'figure', 'style', 'margin');
},
@@
-25668,7
+25667,7
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
new Roo.htmleditor.FilterStyleToTag({ node : d });
new Roo.htmleditor.FilterAttributes({
node : d,
new Roo.htmleditor.FilterStyleToTag({ node : d });
new Roo.htmleditor.FilterAttributes({
node : d,
- attrib_white : ['href', 'src', 'name', 'align', 'colspan', 'rowspan', 'data-display'],
+ attrib_white : ['href', 'src', 'name', 'align', 'colspan', 'rowspan', 'data-display'
, 'data-width'
],
attrib_clean : ['href', 'src' ]
});
new Roo.htmleditor.FilterBlack({ node : d, tag : this.black});
attrib_clean : ['href', 'src' ]
});
new Roo.htmleditor.FilterBlack({ node : d, tag : this.black});