Upgrade TinyMCE

[citadel.git] / webcit / tiny_mce / plugins / advimage / js / image.js

diff --git a/webcit/tiny_mce/plugins/advimage/js/image.js b/webcit/tiny_mce/plugins/advimage/js/image.js
index 64fc6f677b3fa9722d4ef9d1e283e6ddccb752a3..3bda86a2d38e378d31074be4ec621765b207c90e 100644 (file)
--- a/webcit/tiny_mce/plugins/advimage/js/image.js
+++ b/webcit/tiny_mce/plugins/advimage/js/image.js
@@ -272,6 +272,7 @@ var ImageDialog = {
                        cl = tinyMCEPopup.editor.dom.getClasses();\r
 \r
                if (cl.length > 0) {\r
+                       lst.options.length = 0;\r
                        lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');\r
 \r
                        tinymce.each(cl, function(o) {\r
@@ -285,6 +286,7 @@ var ImageDialog = {
                var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;\r
 \r
                l = window[l];\r
+               lst.options.length = 0;\r
 \r
                if (l && l.length > 0) {\r
                        lst.options[lst.options.length] = new Option('', '');\r
@@ -412,7 +414,7 @@ var ImageDialog = {
                        }\r
 \r
                        // Merge\r
-                       dom.get('style').value = dom.serializeStyle(dom.parseStyle(img.style.cssText));\r
+                       dom.get('style').value = dom.serializeStyle(dom.parseStyle(img.style.cssText), 'img');\r
                }\r
        },\r
 \r