projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix file warning
[roojs1]
/
roojs-ui-debug.js
diff --git
a/roojs-ui-debug.js
b/roojs-ui-debug.js
index
f5ff08a
..
fdf8b12
100644
(file)
--- a/
roojs-ui-debug.js
+++ b/
roojs-ui-debug.js
@@
-23536,7
+23536,6
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
store : {
xtype : 'SimpleStore',
data : [
store : {
xtype : 'SimpleStore',
data : [
- ['auto'],
['50%'],
['80%'],
['100%']
['50%'],
['80%'],
['100%']
@@
-23680,7
+23679,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 : {
@@
-23707,9
+23706,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%'
},
},
@@
-23761,7
+23760,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');
},
@@
-25607,7
+25606,7
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
var parser = new Roo.rtf.Parser(cd.getData('text/rtf'));
images = parser.doc ? parser.doc.getElementsByType('pict') : [];
}
var parser = new Roo.rtf.Parser(cd.getData('text/rtf'));
images = parser.doc ? parser.doc.getElementsByType('pict') : [];
}
- Roo.log(images);
+
//
Roo.log(images);
//Roo.log(imgs);
// fixme..
images = images.filter(function(g) { return !g.path.match(/^rtf\/(head|pgdsctbl|listtable|footerf)/); }) // ignore headers/footers etc.
//Roo.log(imgs);
// fixme..
images = images.filter(function(g) { return !g.path.match(/^rtf\/(head|pgdsctbl|listtable|footerf)/); }) // ignore headers/footers etc.
@@
-25641,7
+25640,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});
@@
-25651,6
+25650,8
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
new Roo.htmleditor.FilterSpan({ node : d });
new Roo.htmleditor.FilterLongBr({ node : d });
new Roo.htmleditor.FilterComment({ node : d });
new Roo.htmleditor.FilterSpan({ node : d });
new Roo.htmleditor.FilterLongBr({ node : d });
new Roo.htmleditor.FilterComment({ node : d });
+
+
}
if (this.enableBlocks) {
}
if (this.enableBlocks) {
@@
-25671,7
+25672,7
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
if (this.enableBlocks) {
Roo.htmleditor.Block.initAll(this.doc.body);
}
if (this.enableBlocks) {
Roo.htmleditor.Block.initAll(this.doc.body);
}
-
+
e.preventDefault();
return false;
e.preventDefault();
return false;