aboutsummaryrefslogtreecommitdiff
path: root/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
diff options
context:
space:
mode:
authoriionly <iionly@gmx.de>2013-02-19 20:15:34 +0100
committeriionly <iionly@gmx.de>2013-02-19 20:15:34 +0100
commit4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23 (patch)
tree38a3320f982d5343b11ac63cab158053756db952 /mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
parentd7ca5d846ccf328ec8940950c4e50e8648bab58a (diff)
downloadelgg-4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23.tar.gz
elgg-4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23.tar.bz2
Tinymce plugin: update to version 3.5.8 of Tinymce editor
Diffstat (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js')
-rw-r--r--mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
index 6c2489a16..bb09e75bf 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
+++ b/mod/tinymce/vendor/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');