projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into wip_leon_T7975_caption_check_on_pasted_images
[roojs1]
/
roojs-debug.js
diff --git
a/roojs-debug.js
b/roojs-debug.js
index
04d0a58
..
25e72bd
100644
(file)
--- a/
roojs-debug.js
+++ b/
roojs-debug.js
@@
-50565,8
+50565,11
@@
Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
maxWidth : iw + ' !important', // this is not getting rendered?
margin : m
maxWidth : iw + ' !important', // this is not getting rendered?
margin : m
- }
+ },
+ width: this.align == 'center' ? this.width : '100%'
+
};
};
+
/*
'<div class="{0}" width="420" height="315" src="{1}" frameborder="0" allowfullscreen>' +
'<a href="{2}">' +
/*
'<div class="{0}" width="420" height="315" src="{1}" frameborder="0" allowfullscreen>' +
'<a href="{2}">' +