Imported Upstream version 0.5

[roundcube.git] / program / js / tiny_mce / plugins / paste / js / pasteword.js
diff --git a/program/js/tiny_mce/plugins/paste/js/pasteword.js b/program/js/tiny_mce/plugins/paste/js/pasteword.js

index fe053a7213eb9ee66c52398d46441a719c63e6a1..a52731c368e4db331e36cd11e691731d98dfc91b 100644 (file)
--- a/program/js/tiny_mce/plugins/paste/js/pasteword.js
+++ b/program/js/tiny_mce/plugins/paste/js/pasteword.js
@@ -13,12 +13,12 @@ var PasteWordDialog = {
                 css = [ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css")];\r
                 css = css.concat(tinymce.explode(ed.settings.content_css) || []);\r
                 tinymce.each(css, function(u) {\r
-                       cssHTML += '<link href="' + ed.documentBaseURI.toAbsolute(u) + '" rel="stylesheet" type="text/css" />';\r
+                       cssHTML += '<link href="' + ed.documentBaseURI.toAbsolute('' + u) + '" rel="stylesheet" type="text/css" />';\r
                 });\r
  \r
                 // Write content into iframe\r
                 doc.open();\r
-               doc.write('<html><head>' + cssHTML + '</head><body spellcheck="false"></body></html>');\r
+               doc.write('<html><head>' + cssHTML + '</head><body class="mceContentBody" spellcheck="false"></body></html>');\r
                 doc.close();\r
  \r
                 doc.designMode = 'on';\r
@@ -32,7 +32,7 @@ var PasteWordDialog = {
         insert : function() {\r
                 var h = document.getElementById('iframe').contentWindow.document.body.innerHTML;\r
  \r
-               tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, h);\r
+               tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h, wordContent : true});\r
                 tinyMCEPopup.close();\r
         },\r
  \r