diff options
author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-04 12:04:17 +0530 |
---|---|---|
committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-04 12:04:17 +0530 |
commit | 12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89 (patch) | |
tree | 49e5e7dd30e1b1263fa5a9c9921b4a59758d94bd /library/tinymce/jscripts/tiny_mce/themes/advanced/js | |
parent | 3a45d4f9e0af301b8fdd4d509fc7ffe7514fb519 (diff) | |
parent | ca105f1c669950768a1f4cd6b93f471cabbc5114 (diff) | |
download | volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.tar.gz volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.tar.bz2 volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.zip |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'library/tinymce/jscripts/tiny_mce/themes/advanced/js')
-rw-r--r-- | library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js index 6c2489a16..bb09e75bf 100644 --- a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js +++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js @@ -104,10 +104,12 @@ var ImageDialog = { },
updateStyle : function() {
- var dom = tinyMCEPopup.dom, st, v, f = document.forms[0];
+ var dom = tinyMCEPopup.dom, st = {}, v, f = document.forms[0];
if (tinyMCEPopup.editor.settings.inline_styles) {
- st = tinyMCEPopup.dom.parseStyle(this.styleVal);
+ tinymce.each(tinyMCEPopup.dom.parseStyle(this.styleVal), function(value, key) {
+ st[key] = value;
+ });
// Handle align
v = getSelectValue(f, 'align');
|