WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TinyMCE: update the 'paste' plugin to the latest dev. version. Included changes: 1b7c41cd7b and 7998b8025d. See #27909, for trunk. 

Built from https://develop.svn.wordpress.org/trunk@28192


git-svn-id: http://core.svn.wordpress.org/trunk@28022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-04-24 00:59:13 +00:00
parent d6e03df3c9
commit 5de05f97dd
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/js/tinymce/plugins/paste/plugin.js
View File

@ -1036,7 +1036,8 @@ define("tinymce/pasteplugin/WordFilter", [
if (!href && !name) { if (!href && !name) {
node.unwrap(); node.unwrap();
} else { } else {
if (name && name.indexOf('Toc') !== 0) { // Remove all named anchors that isn't toc specific
if (name && !/^_?toc/i.test(name)) {
node.unwrap(); node.unwrap();
continue; continue;
} }
@ -1112,7 +1113,8 @@ define("tinymce/pasteplugin/Quirks", [
*/ */
function removeWebKitFragments(html) { function removeWebKitFragments(html) {
html = Utils.filter(html, [ html = Utils.filter(html, [
/^[\s\S]*<!--StartFragment-->|<!--EndFragment-->[\s\S]*$/g, // WebKit fragment /^[\s\S]*<body[^>]*>\s*<!--StartFragment-->|<!--EndFragment-->\s*<\/body[^>]*>[\s\S]*$/g, // WebKit fragment body
/<!--StartFragment-->|<!--EndFragment-->/g, // Inner fragments (tables from excel on mac)
[/<span class="Apple-converted-space">\u00a0<\/span>/g, '\u00a0'], // WebKit &nbsp; [/<span class="Apple-converted-space">\u00a0<\/span>/g, '\u00a0'], // WebKit &nbsp;
/<br>$/i // Traling BR elements /<br>$/i // Traling BR elements
]); ]);

2
wp-includes/js/tinymce/plugins/paste/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.