Wordpress 3.5

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / themes / advanced / js / image.js

diff --git a/wp-includes/js/tinymce/themes/advanced/js/image.js b/wp-includes/js/tinymce/themes/advanced/js/image.js
index 313ca5d17fd827acdf1be0b05ca6a456152259b8..3f93e2d3218b0c239e489336be1c335c0d320d21 100644 (file)
--- a/wp-includes/js/tinymce/themes/advanced/js/image.js
+++ b/wp-includes/js/tinymce/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');