X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/959f97d8ecd5c1668103a3e41c795486b944bc68..fef8173b8c3bad08f495551e43cfdeac1cae6021:/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 4c018eda..cb288035 100644
--- a/wp-includes/js/tinymce/themes/advanced/js/image.js
+++ b/wp-includes/js/tinymce/themes/advanced/js/image.js
@@ -76,7 +76,7 @@ var ImageDialog = {
});
} else
args.style = this.styleVal;
-
+
tinymce.extend(args, {
src : f.src.value,
alt : f.alt.value,
@@ -90,7 +90,7 @@ var ImageDialog = {
if (el && el.nodeName == 'IMG') {
ed.dom.setAttribs(el, args);
} else {
- ed.execCommand('mceInsertContent', false, '', {skip_undo : 1});
+ ed.execCommand('mceInsertContent', false, '', {skip_undo : 1});
ed.dom.setAttribs('__mce_tmp', args);
ed.dom.setAttrib('__mce_tmp', 'id', '');
ed.undoManager.add();
@@ -160,8 +160,8 @@ var ImageDialog = {
}
// Merge
- st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st));
- this.styleVal = dom.serializeStyle(st);
+ st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st), 'img');
+ this.styleVal = dom.serializeStyle(st, 'img');
}
},