vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update TinyMCE to 3.5.4.1, fixes #21173

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@21228 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2012-07-07 16:22:53 +00:00
parent 28d82c9b04
commit 35d883e244
42 changed files with 379 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/js/tinymce/plugins/paste/editor_plugin.js
+1 -1
View File
File diff suppressed because one or more lines are too long
wp-includes/js/tinymce/plugins/paste/editor_plugin_src.js
+1 -1
View File
@@ -359,7 +359,7 @@
}
// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
if (tinymce.isIE && document.documentMode >= 9) {
if (tinymce.isIE && document.documentMode >= 9 && /<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(o.content)) {
// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
process([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g, '$1']]);
wp-includes/js/tinymce/plugins/paste/pastetext.htm
+2 -2
View File
@@ -1,8 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#paste.paste_text_desc}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/pastetext.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3541-20120705"></script>
<script type="text/javascript" src="js/pastetext.js?ver=3541-20120705"></script>
</head>
<body onresize="PasteTextDialog.resize();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="return PasteTextDialog.insert();" action="#">
wp-includes/js/tinymce/plugins/paste/pasteword.htm
+2 -2
View File
@@ -1,8 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#paste.paste_word_desc}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/pasteword.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3541-20120705"></script>
<script type="text/javascript" src="js/pasteword.js?ver=3541-20120705"></script>
</head>
<body onresize="PasteWordDialog.resize();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="return PasteWordDialog.insert();" action="#">