TinyMCE 3.2.7

git-svn-id: https://develop.svn.wordpress.org/trunk@11974 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2009-09-26 08:33:16 +00:00
parent a8505d056f
commit c4571d4a60
30 changed files with 114 additions and 110 deletions
File diff suppressed because one or more lines are too long
@@ -19,7 +19,7 @@ var PasteTextDialog = {
}
}
tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, h);
tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h});
tinyMCEPopup.close();
},
@@ -13,7 +13,7 @@ var PasteWordDialog = {
css = [ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css")];
css = css.concat(tinymce.explode(ed.settings.content_css) || []);
tinymce.each(css, function(u) {
cssHTML += '<link href="' + ed.documentBaseURI.toAbsolute(u) + '" rel="stylesheet" type="text/css" />';
cssHTML += '<link href="' + ed.documentBaseURI.toAbsolute('' + u) + '" rel="stylesheet" type="text/css" />';
});
// Write content into iframe
@@ -32,7 +32,7 @@ var PasteWordDialog = {
insert : function() {
var h = document.getElementById('iframe').contentWindow.document.body.innerHTML;
tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, h);
tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h, wordContent : true});
tinyMCEPopup.close();
},
@@ -2,8 +2,8 @@
<head>
<title>{#paste.paste_text_desc}</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script>
<script type="text/javascript" src="js/pastetext.js?ver=3241-1141"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="js/pastetext.js?ver=327-1235"></script>
</head>
<body onresize="PasteTextDialog.resize();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="return PasteTextDialog.insert();" action="#">
@@ -30,4 +30,4 @@
</div>
</form>
</body>
</html>
</html>
@@ -2,8 +2,8 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>{#paste.paste_word_desc}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script>
<script type="text/javascript" src="js/pasteword.js?ver=3241-1141"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="js/pasteword.js?ver=327-1235"></script>
</head>
<body onresize="PasteWordDialog.resize();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="return PasteWordDialog.insert();" action="#">