diff options
| author | zottel <github@zottel.net> | 2012-05-17 01:24:37 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-17 01:24:37 +0200 |
| commit | 764ac240a9a9ffb7c855a69bc2f81e9d314a617f (patch) | |
| tree | 2d9555171267adc0c624ff52c33adb9103c4ef48 /library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js | |
| parent | e9aeafbe13fc8b6371914ecbff67a19769b84bb5 (diff) | |
| parent | f5f345d388c9f1f0a47bad75c933d1bfe723773d (diff) | |
| download | volse-hubzilla-764ac240a9a9ffb7c855a69bc2f81e9d314a617f.tar.gz volse-hubzilla-764ac240a9a9ffb7c855a69bc2f81e9d314a617f.tar.bz2 volse-hubzilla-764ac240a9a9ffb7c855a69bc2f81e9d314a617f.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.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');
|