Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Update the TinyMCE initialization:

Browse Source 
- Replace `wp_htmledit_pre()` and `wp_richedit_pre()` with `format_for_editor()`.
- Replace the `'htmledit_pre'` and `'richedit_pre'` filters with `'format_for_editor'`.
- Do not run the post content through `wpautop()` in PHP when the visual editor is default. Run the textarea content through the JS wpautop on initializing TinyMCE.
- Simplify both editors initialization.
- Improve setting of `wpActiveEditor` in Quicktags.
- Improve editor.js, use `tinymce.$` when possible.
See #32425.
Built from https://develop.svn.wordpress.org/trunk@32899


git-svn-id: http://core.svn.wordpress.org/trunk@32870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-06-21 22:01:28 +00:00
parent a680859400
commit e4758f42e5
20 changed files with 590 additions and 474 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/css/edit-rtl.css
View File

@ -425,6 +425,10 @@ td.plugin-title p {
visibility: visible !important;
}
.mce-fullscreen #wp-content-wrap .mce-tinymce .mce-wp-dfw {
display: none;
}
.post-php.mce-fullscreen #wpadminbar,
.mce-fullscreen #wp-content-wrap .mce-wp-dfw {
display: none;

4
wp-admin/css/edit.css
View File

@ -425,6 +425,10 @@ td.plugin-title p {
visibility: visible !important;
}
.mce-fullscreen #wp-content-wrap .mce-tinymce .mce-wp-dfw {
display: none;
}
.post-php.mce-fullscreen #wpadminbar,
.mce-fullscreen #wp-content-wrap .mce-wp-dfw {
display: none;

2
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

576
wp-admin/js/editor.js
View File

@ -1,38 +1,29 @@
/* global tinymce, tinyMCEPreInit, QTags, setUserSetting */
window.switchEditors = {
( function( $ ) {
function SwitchEditors() {
var tinymce, $$,
exports = {};
switchto: function( el ) {
var aid = el.id,
l = aid.length,
id = aid.substr( 0, l - 5 ),
mode = aid.substr( l - 4 );
function init() {
if ( ! tinymce && window.tinymce ) {
tinymce = window.tinymce;
$$ = tinymce.$;
this.go( id, mode );
},
$$( document ).on( 'click', function( event ) {
var id, mode,
target = $$( event.target );
// mode can be 'html', 'tmce', or 'toggle'; 'html' is used for the 'Text' editor tab.
go: function( id, mode ) {
var t = this, ed, wrap_id, txtarea_el, iframe, editorHeight, toolbarHeight,
DOM = tinymce.DOM; //DOMUtils outside the editor iframe
id = id || 'content';
mode = mode || 'toggle';
ed = tinymce.get( id );
wrap_id = 'wp-' + id + '-wrap';
txtarea_el = DOM.get( id );
if ( 'toggle' === mode ) {
if ( ed && ! ed.isHidden() ) {
mode = 'html';
} else {
mode = 'tmce';
if ( target.hasClass( 'wp-switch-editor' ) ) {
id = target.attr( 'data-wp-editor-id' );
mode = target.hasClass( 'switch-tmce' ) ? 'tmce' : 'html';
switchEditor( id, mode );
}
});
}
}
function getToolbarHeight() {
var node = DOM.select( '.mce-toolbar-grp', ed.getContainer() )[0],
function getToolbarHeight( editor ) {
var node = $$( '.mce-toolbar-grp', editor.getContainer() )[0],
height = node && node.clientHeight;
if ( height && height > 10 && height < 200 ) {
@ -42,283 +33,332 @@ window.switchEditors = {
return 30;
}
if ( 'tmce' === mode || 'tinymce' === mode ) {
if ( ed && ! ed.isHidden() ) {
return false;
}
function switchEditor( id, mode ) {
id = id || 'content';
mode = mode || 'toggle';
if ( typeof( QTags ) !== 'undefined' ) {
QTags.closeAllTags( id );
}
var editorHeight, toolbarHeight, iframe,
editor = tinymce.get( id ),
wrap = $$( '#wp-' + id + '-wrap' ),
$textarea = $$( '#' + id ),
textarea = $textarea[0];
editorHeight = txtarea_el ? parseInt( txtarea_el.style.height, 10 ) : 0;
if ( tinyMCEPreInit.mceInit[ id ] && tinyMCEPreInit.mceInit[ id ].wpautop ) {
txtarea_el.value = t.wpautop( txtarea_el.value );
}
if ( ed ) {
ed.show();
// No point resizing the iframe in iOS
if ( ! tinymce.Env.iOS && editorHeight ) {
toolbarHeight = getToolbarHeight();
editorHeight = editorHeight - toolbarHeight + 14;
// height cannot be under 50 or over 5000
if ( editorHeight > 50 && editorHeight < 5000 ) {
ed.theme.resizeTo( null, editorHeight );
}
if ( 'toggle' === mode ) {
if ( editor && ! editor.isHidden() ) {
mode = 'html';
} else {
mode = 'tmce';
}
} else {
tinymce.init( tinyMCEPreInit.mceInit[id] );
}
DOM.removeClass( wrap_id, 'html-active' );
DOM.addClass( wrap_id, 'tmce-active' );
DOM.setAttrib( txtarea_el, 'aria-hidden', true );
setUserSetting( 'editor', 'tinymce' );
if ( 'tmce' === mode || 'tinymce' === mode ) {
if ( editor && ! editor.isHidden() ) {
return false;
}
} else if ( 'html' === mode ) {
if ( typeof( window.QTags ) !== 'undefined' ) {
window.QTags.closeAllTags( id );
}
if ( ed && ed.isHidden() ) {
return false;
}
editorHeight = parseInt( textarea.style.height, 10 ) || 0;
if ( ed ) {
if ( ! tinymce.Env.iOS ) {
iframe = DOM.get( id + '_ifr' );
editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0;
if ( editor ) {
editor.show();
if ( editorHeight ) {
toolbarHeight = getToolbarHeight();
editorHeight = editorHeight + toolbarHeight - 14;
// No point resizing the iframe in iOS
if ( ! tinymce.Env.iOS && editorHeight ) {
toolbarHeight = getToolbarHeight( editor );
editorHeight = editorHeight - toolbarHeight + 14;
// height cannot be under 50 or over 5000
if ( editorHeight > 50 && editorHeight < 5000 ) {
txtarea_el.style.height = editorHeight + 'px';
editor.theme.resizeTo( null, editorHeight );
}
}
} else {
tinymce.init( window.tinyMCEPreInit.mceInit[id] );
}
ed.hide();
} else {
// The TinyMCE instance doesn't exist, run the content through 'pre_wpautop()' and show the textarea
if ( tinyMCEPreInit.mceInit[ id ] && tinyMCEPreInit.mceInit[ id ].wpautop ) {
txtarea_el.value = t.pre_wpautop( txtarea_el.value );
wrap.removeClass( 'html-active' ).addClass( 'tmce-active' );
$textarea.attr( 'aria-hidden', true );
window.setUserSetting( 'editor', 'tinymce' );
} else if ( 'html' === mode ) {
if ( editor && editor.isHidden() ) {
return false;
}
DOM.setStyles( txtarea_el, {'display': '', 'visibility': ''} );
if ( editor ) {
if ( ! tinymce.Env.iOS ) {
iframe = editor.iframeElement;
editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0;
if ( editorHeight ) {
toolbarHeight = getToolbarHeight( editor );
editorHeight = editorHeight + toolbarHeight - 14;
// height cannot be under 50 or over 5000
if ( editorHeight > 50 && editorHeight < 5000 ) {
textarea.style.height = editorHeight + 'px';
}
}
}
editor.hide();
} else {
// The TinyMCE instance doesn't exist, show the textarea
$textarea.css({ 'display': '', 'visibility': '' });
}
wrap.removeClass( 'tmce-active' ).addClass( 'html-active' );
$textarea.attr( 'aria-hidden', false );
window.setUserSetting( 'editor', 'html' );
}
}
// Replace paragraphs with double line breaks
function removep( html ) {
var blocklist = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|fieldset',
blocklist1 = blocklist + '|div|p',
blocklist2 = blocklist + '|pre',
preserve_linebreaks = false,
preserve_br = false;
if ( ! html ) {
return '';
}
DOM.removeClass( wrap_id, 'tmce-active' );
DOM.addClass( wrap_id, 'html-active' );
DOM.setAttrib( txtarea_el, 'aria-hidden', false );
setUserSetting( 'editor', 'html' );
}
return false;
},
_wp_Nop: function( content ) {
var blocklist1, blocklist2,
preserve_linebreaks = false,
preserve_br = false;
// Protect pre|script tags
if ( content.indexOf( '<pre' ) !== -1 || content.indexOf( '<script' ) !== -1 ) {
preserve_linebreaks = true;
content = content.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
a = a.replace( /<br ?\/?>(\r\n|\n)?/g, '<wp-line-break>' );
a = a.replace( /<\/?p( [^>]*)?>(\r\n|\n)?/g, '<wp-line-break>' );
return a.replace( /\r?\n/g, '<wp-line-break>' );
});
}
// keep <br> tags inside captions and remove line breaks
if ( content.indexOf( '[caption' ) !== -1 ) {
preserve_br = true;
content = content.replace( /\[caption[\s\S]+?\[\/caption\]/g, function( a ) {
return a.replace( /<br([^>]*)>/g, '<wp-temp-br$1>' ).replace( /[\r\n\t]+/, '' );
});
}
// Pretty it up for the source editor
blocklist1 = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p|fieldset';
content = content.replace( new RegExp( '\\s*</(' + blocklist1 + ')>\\s*', 'g' ), '</$1>\n' );
content = content.replace( new RegExp( '\\s*<((?:' + blocklist1 + ')(?: [^>]*)?)>', 'g' ), '\n<$1>' );
// Mark </p> if it has any attributes.
content = content.replace( /(<p [^>]+>.*?)<\/p>/g, '$1</p#>' );
// Separate <div> containing <p>
content = content.replace( /<div( [^>]*)?>\s*<p>/gi, '<div$1>\n\n' );
// Remove <p> and <br />
content = content.replace( /\s*<p>/gi, '' );
content = content.replace( /\s*<\/p>\s*/gi, '\n\n' );
content = content.replace( /\n[\s\u00a0]+\n/g, '\n\n' );
content = content.replace( /\s*<br ?\/?>\s*/gi, '\n' );
// Fix some block element newline issues
content = content.replace( /\s*<div/g, '\n<div' );
content = content.replace( /<\/div>\s*/g, '</div>\n' );
content = content.replace( /\s*\[caption([^\[]+)\[\/caption\]\s*/gi, '\n\n[caption$1[/caption]\n\n' );
content = content.replace( /caption\]\n\n+\[caption/g, 'caption]\n\n[caption' );
blocklist2 = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|pre|fieldset';
content = content.replace( new RegExp('\\s*<((?:' + blocklist2 + ')(?: [^>]*)?)\\s*>', 'g' ), '\n<$1>' );
content = content.replace( new RegExp('\\s*</(' + blocklist2 + ')>\\s*', 'g' ), '</$1>\n' );
content = content.replace( /<li([^>]*)>/g, '\t<li$1>' );
if ( content.indexOf( '<option' ) !== -1 ) {
content = content.replace( /\s*<option/g, '\n<option' );
content = content.replace( /\s*<\/select>/g, '\n</select>' );
}
if ( content.indexOf( '<hr' ) !== -1 ) {
content = content.replace( /\s*<hr( [^>]*)?>\s*/g, '\n\n<hr$1>\n\n' );
}
if ( content.indexOf( '<object' ) !== -1 ) {
content = content.replace( /<object[\s\S]+?<\/object>/g, function( a ) {
return a.replace( /[\r\n]+/g, '' );
});
}
// Unmark special paragraph closing tags
content = content.replace( /<\/p#>/g, '</p>\n' );
content = content.replace( /\s*(<p [^>]+>[\s\S]*?<\/p>)/g, '\n$1' );
// Trim whitespace
content = content.replace( /^\s+/, '' );
content = content.replace( /[\s\u00a0]+$/, '' );
// put back the line breaks in pre|script
if ( preserve_linebreaks ) {
content = content.replace( /<wp-line-break>/g, '\n' );
}
// and the <br> tags in captions
if ( preserve_br ) {
content = content.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
}
return content;
},
_wp_Autop: function(pee) {
var preserve_linebreaks = false,
preserve_br = false,
blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre' +
'|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section' +
'|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
if ( pee.indexOf( '<object' ) !== -1 ) {
pee = pee.replace( /<object[\s\S]+?<\/object>/g, function( a ) {
return a.replace( /[\r\n]+/g, '' );
});
}
pee = pee.replace( /<[^<>]+>/g, function( a ){
return a.replace( /[\r\n]+/g, ' ' );
});
// Protect pre|script tags
if ( pee.indexOf( '<pre' ) !== -1 || pee.indexOf( '<script' ) !== -1 ) {
preserve_linebreaks = true;
pee = pee.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
return a.replace( /(\r\n|\n)/g, '<wp-line-break>' );
});
}
// keep <br> tags inside captions and convert line breaks
if ( pee.indexOf( '[caption' ) !== -1 ) {
preserve_br = true;
pee = pee.replace( /\[caption[\s\S]+?\[\/caption\]/g, function( a ) {
// keep existing <br>
a = a.replace( /<br([^>]*)>/g, '<wp-temp-br$1>' );
// no line breaks inside HTML tags
a = a.replace( /<[a-zA-Z0-9]+( [^<>]+)?>/g, function( b ) {
return b.replace( /[\r\n\t]+/, ' ' );
// Protect pre|script tags
if ( html.indexOf( '<pre' ) !== -1 || html.indexOf( '<script' ) !== -1 ) {
preserve_linebreaks = true;
html = html.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
a = a.replace( /<br ?\/?>(\r\n|\n)?/g, '<wp-line-break>' );
a = a.replace( /<\/?p( [^>]*)?>(\r\n|\n)?/g, '<wp-line-break>' );
return a.replace( /\r?\n/g, '<wp-line-break>' );
});
// convert remaining line breaks to <br>
return a.replace( /\s*\n\s*/g, '<wp-temp-br />' );
});
}
pee = pee + '\n\n';
pee = pee.replace( /<br \/>\s*<br \/>/gi, '\n\n' );
pee = pee.replace( new RegExp( '(<(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '\n$1' );
pee = pee.replace( new RegExp( '(</(?:' + blocklist + ')>)', 'gi' ), '$1\n\n' );
pee = pee.replace( /<hr( [^>]*)?>/gi, '<hr$1>\n\n' ); // hr is self closing block element
pee = pee.replace( /\s*<option/gi, '<option' ); // No <p> or <br> around <option>
pee = pee.replace( /<\/option>\s*/gi, '</option>' );
pee = pee.replace( /\r\n|\r/g, '\n' );
pee = pee.replace( /\n\s*\n+/g, '\n\n' );
pee = pee.replace( /([\s\S]+?)\n\n/g, '<p>$1</p>\n' );
pee = pee.replace( /<p>\s*?<\/p>/gi, '');
pee = pee.replace( new RegExp( '<p>\\s*(</?(?:' + blocklist + ')(?: [^>]*)?>)\\s*</p>', 'gi' ), '$1' );
pee = pee.replace( /<p>(<li.+?)<\/p>/gi, '$1');
pee = pee.replace( /<p>\s*<blockquote([^>]*)>/gi, '<blockquote$1><p>');
pee = pee.replace( /<\/blockquote>\s*<\/p>/gi, '</p></blockquote>');
pee = pee.replace( new RegExp( '<p>\\s*(</?(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '$1' );
pee = pee.replace( new RegExp( '(</?(?:' + blocklist + ')(?: [^>]*)?>)\\s*</p>', 'gi' ), '$1' );
pee = pee.replace( /\s*\n/gi, '<br />\n');
pee = pee.replace( new RegExp( '(</?(?:' + blocklist + ')[^>]*>)\\s*<br />', 'gi' ), '$1' );
pee = pee.replace( /<br \/>(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi, '$1' );
pee = pee.replace( /(?:<p>|<br ?\/?>)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|<br ?\/?>)*/gi, '[caption$1[/caption]' );
pee = pee.replace( /(<(?:div|th|td|form|fieldset|dd)[^>]*>)(.*?)<\/p>/g, function( a, b, c ) {
if ( c.match( /<p( [^>]*)?>/ ) ) {
return a;
}
return b + '<p>' + c + '</p>';
});
// keep <br> tags inside captions and remove line breaks
if ( html.indexOf( '[caption' ) !== -1 ) {
preserve_br = true;
html = html.replace( /\[caption[\s\S]+?\[\/caption\]/g, function( a ) {
return a.replace( /<br([^>]*)>/g, '<wp-temp-br$1>' ).replace( /[\r\n\t]+/, '' );
});
}
// put back the line breaks in pre|script
if ( preserve_linebreaks ) {
pee = pee.replace( /<wp-line-break>/g, '\n' );
// Pretty it up for the source editor
html = html.replace( new RegExp( '\\s*</(' + blocklist1 + ')>\\s*', 'g' ), '</$1>\n' );
html = html.replace( new RegExp( '\\s*<((?:' + blocklist1 + ')(?: [^>]*)?)>', 'g' ), '\n<$1>' );
// Mark </p> if it has any attributes.
html = html.replace( /(<p [^>]+>.*?)<\/p>/g, '$1</p#>' );
// Separate <div> containing <p>
html = html.replace( /<div( [^>]*)?>\s*<p>/gi, '<div$1>\n\n' );
// Remove <p> and <br />
html = html.replace( /\s*<p>/gi, '' );
html = html.replace( /\s*<\/p>\s*/gi, '\n\n' );
html = html.replace( /\n[\s\u00a0]+\n/g, '\n\n' );
html = html.replace( /\s*<br ?\/?>\s*/gi, '\n' );
// Fix some block element newline issues
html = html.replace( /\s*<div/g, '\n<div' );
html = html.replace( /<\/div>\s*/g, '</div>\n' );
html = html.replace( /\s*\[caption([^\[]+)\[\/caption\]\s*/gi, '\n\n[caption$1[/caption]\n\n' );
html = html.replace( /caption\]\n\n+\[caption/g, 'caption]\n\n[caption' );
html = html.replace( new RegExp('\\s*<((?:' + blocklist2 + ')(?: [^>]*)?)\\s*>', 'g' ), '\n<$1>' );
html = html.replace( new RegExp('\\s*</(' + blocklist2 + ')>\\s*', 'g' ), '</$1>\n' );
html = html.replace( /<li([^>]*)>/g, '\t<li$1>' );
if ( html.indexOf( '<option' ) !== -1 ) {
html = html.replace( /\s*<option/g, '\n<option' );
html = html.replace( /\s*<\/select>/g, '\n</select>' );
}
if ( html.indexOf( '<hr' ) !== -1 ) {
html = html.replace( /\s*<hr( [^>]*)?>\s*/g, '\n\n<hr$1>\n\n' );
}
if ( html.indexOf( '<object' ) !== -1 ) {
html = html.replace( /<object[\s\S]+?<\/object>/g, function( a ) {
return a.replace( /[\r\n]+/g, '' );
});
}
// Unmark special paragraph closing tags
html = html.replace( /<\/p#>/g, '</p>\n' );
html = html.replace( /\s*(<p [^>]+>[\s\S]*?<\/p>)/g, '\n$1' );
// Trim whitespace
html = html.replace( /^\s+/, '' );
html = html.replace( /[\s\u00a0]+$/, '' );
// put back the line breaks in pre|script
if ( preserve_linebreaks ) {
html = html.replace( /<wp-line-break>/g, '\n' );
}
// and the <br> tags in captions
if ( preserve_br ) {
html = html.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
}
return html;
}
if ( preserve_br ) {
pee = pee.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
// Similar to `wpautop()` in formatting.php
function autop( text ) {
var preserve_linebreaks = false,
preserve_br = false,
blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre' +
'|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section' +
'|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
// Normalize line breaks
text = text.replace( /\r\n|\r/g, '\n' );
if ( text.indexOf( '\n' ) === -1 ) {
return text;
}
if ( text.indexOf( '<object' ) !== -1 ) {
text = text.replace( /<object[\s\S]+?<\/object>/g, function( a ) {
return a.replace( /\n+/g, '' );
});
}
text = text.replace( /<[^<>]+>/g, function( a ) {
return a.replace( /[\n\t ]+/g, ' ' );
});
// Protect pre|script tags
if ( text.indexOf( '<pre' ) !== -1 || text.indexOf( '<script' ) !== -1 ) {
preserve_linebreaks = true;
text = text.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
return a.replace( /\n/g, '<wp-line-break>' );
});
}
// keep <br> tags inside captions and convert line breaks
if ( text.indexOf( '[caption' ) !== -1 ) {
preserve_br = true;
text = text.replace( /\[caption[\s\S]+?\[\/caption\]/g, function( a ) {
// keep existing <br>
a = a.replace( /<br([^>]*)>/g, '<wp-temp-br$1>' );
// no line breaks inside HTML tags
a = a.replace( /<[^<>]+>/g, function( b ) {
return b.replace( /[\n\t ]+/, ' ' );
});
// convert remaining line breaks to <br>
return a.replace( /\s*\n\s*/g, '<wp-temp-br />' );
});
}
text = text + '\n\n';
text = text.replace( /<br \/>\s*<br \/>/gi, '\n\n' );
text = text.replace( new RegExp( '(<(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '\n$1' );
text = text.replace( new RegExp( '(</(?:' + blocklist + ')>)', 'gi' ), '$1\n\n' );
text = text.replace( /<hr( [^>]*)?>/gi, '<hr$1>\n\n' ); // hr is self closing block element
text = text.replace( /\s*<option/gi, '<option' ); // No <p> or <br> around <option>
text = text.replace( /<\/option>\s*/gi, '</option>' );
text = text.replace( /\n\s*\n+/g, '\n\n' );
text = text.replace( /([\s\S]+?)\n\n/g, '<p>$1</p>\n' );
text = text.replace( /<p>\s*?<\/p>/gi, '');
text = text.replace( new RegExp( '<p>\\s*(</?(?:' + blocklist + ')(?: [^>]*)?>)\\s*</p>', 'gi' ), '$1' );
text = text.replace( /<p>(<li.+?)<\/p>/gi, '$1');
text = text.replace( /<p>\s*<blockquote([^>]*)>/gi, '<blockquote$1><p>');
text = text.replace( /<\/blockquote>\s*<\/p>/gi, '</p></blockquote>');
text = text.replace( new RegExp( '<p>\\s*(</?(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '$1' );
text = text.replace( new RegExp( '(</?(?:' + blocklist + ')(?: [^>]*)?>)\\s*</p>', 'gi' ), '$1' );
text = text.replace( /\s*\n/gi, '<br />\n');
text = text.replace( new RegExp( '(</?(?:' + blocklist + ')[^>]*>)\\s*<br />', 'gi' ), '$1' );
text = text.replace( /<br \/>(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi, '$1' );
text = text.replace( /(?:<p>|<br ?\/?>)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|<br ?\/?>)*/gi, '[caption$1[/caption]' );
text = text.replace( /(<(?:div|th|td|form|fieldset|dd)[^>]*>)(.*?)<\/p>/g, function( a, b, c ) {
if ( c.match( /<p( [^>]*)?>/ ) ) {
return a;
}
return b + '<p>' + c + '</p>';
});
// put back the line breaks in pre|script
if ( preserve_linebreaks ) {
text = text.replace( /<wp-line-break>/g, '\n' );
}
if ( preserve_br ) {
text = text.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
}
return text;
}
return pee;
},
// Add old events
function pre_wpautop( html ) {
var obj = { o: exports, data: html, unfiltered: html };
pre_wpautop: function( content ) {
var t = this, o = { o: t, data: content, unfiltered: content },
q = typeof( jQuery ) !== 'undefined';
if ( $ ) {
$( 'body' ).trigger( 'beforePreWpautop', [ obj ] );
}
if ( q ) {
jQuery( 'body' ).trigger( 'beforePreWpautop', [ o ] );
obj.data = removep( obj.data );
if ( $ ) {
$( 'body' ).trigger( 'afterPreWpautop', [ obj ] );
}
return obj.data;
}
o.data = t._wp_Nop( o.data );
function wpautop( text ) {
var obj = { o: exports, data: text, unfiltered: text };
if ( q ) {
jQuery('body').trigger('afterPreWpautop', [ o ] );
if ( $ ) {
$( 'body' ).trigger( 'beforeWpautop', [ obj ] );
}
obj.data = autop( obj.data );
if ( $ ) {
$( 'body' ).trigger( 'afterWpautop', [ obj ] );
}
return obj.data;
}
return o.data;
},
wpautop: function( pee ) {
var t = this, o = { o: t, data: pee, unfiltered: pee },
q = typeof( jQuery ) !== 'undefined';
if ( q ) {
jQuery( 'body' ).trigger('beforeWpautop', [ o ] );
if ( $ ) {
$( document ).ready( init );
} else if ( document.addEventListener ) {
document.addEventListener( 'DOMContentLoaded', init, false );
window.addEventListener( 'load', init, false );
} else if ( window.attachEvent ) {
window.attachEvent( 'onload', init );
document.attachEvent( 'onreadystatechange', function() {
if ( 'complete' === document.readyState ) {
init();
}
} );
}
o.data = t._wp_Autop( o.data );
window.wp = window.wp || {};
window.wp.editor = window.wp.editor || {};
window.wp.editor.autop = wpautop;
window.wp.editor.removep = pre_wpautop;
if ( q ) {
jQuery( 'body' ).trigger('afterWpautop', [ o ] );
}
exports = {
go: switchEditor,
wpautop: wpautop,
pre_wpautop: pre_wpautop,
_wp_Autop: autop,
_wp_Nop: removep
};
return o.data;
return exports;
}
};
window.switchEditors = new SwitchEditors();
}( window.jQuery ));

2
wp-admin/js/editor.min.js vendored
View File

File diff suppressed because one or more lines are too long

197
wp-includes/class-wp-editor.php
View File

@ -143,71 +143,74 @@ final class _WP_Editors {
* @param array $settings See the _parse_settings() method for description.
*/
public static function editor( $content, $editor_id, $settings = array() ) {
$set = self::parse_settings( $editor_id, $settings );
$editor_class = ' class="' . trim( $set['editor_class'] . ' wp-editor-area' ) . '"';
$editor_class = ' class="' . trim( esc_attr( $set['editor_class'] ) . ' wp-editor-area' ) . '"';
$tabindex = $set['tabindex'] ? ' tabindex="' . (int) $set['tabindex'] . '"' : '';
$switch_class = 'html-active';
$default_editor = 'html';
$toolbar = $buttons = $autocomplete = '';
$editor_id_attr = esc_attr( $editor_id );
if ( $set['drag_drop_upload'] ) {
self::$drag_drop_upload = true;
}
if ( ! empty( $set['editor_height'] ) )
$height = ' style="height: ' . $set['editor_height'] . 'px"';
else
$height = ' rows="' . $set['textarea_rows'] . '"';
if ( !current_user_can( 'upload_files' ) )
$set['media_buttons'] = false;
if ( ! self::$this_quicktags && self::$this_tinymce ) {
$switch_class = 'tmce-active';
$autocomplete = ' autocomplete="off"';
} elseif ( self::$this_quicktags && self::$this_tinymce ) {
$default_editor = $set['default_editor'] ? $set['default_editor'] : wp_default_editor();
$autocomplete = ' autocomplete="off"';
// 'html' is used for the "Text" editor tab.
if ( 'html' === $default_editor ) {
add_filter('the_editor_content', 'wp_htmledit_pre');
$switch_class = 'html-active';
} else {
add_filter('the_editor_content', 'wp_richedit_pre');
$switch_class = 'tmce-active';
}
$buttons .= '<button type="button" id="' . $editor_id . '-tmce" class="wp-switch-editor switch-tmce" onclick="switchEditors.switchto(this);">' . __('Visual') . "</button>\n";
$buttons .= '<button type="button" id="' . $editor_id . '-html" class="wp-switch-editor switch-html" onclick="switchEditors.switchto(this);">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</button>\n";
if ( ! empty( $set['editor_height'] ) ) {
$height = ' style="height: ' . (int) $set['editor_height'] . 'px"';
} else {
$height = ' rows="' . (int) $set['textarea_rows'] . '"';
}
if ( ! current_user_can( 'upload_files' ) ) {
$set['media_buttons'] = false;
}
if ( self::$this_tinymce ) {
$autocomplete = ' autocomplete="off"';
if ( self::$this_quicktags ) {
$default_editor = $set['default_editor'] ? $set['default_editor'] : wp_default_editor();
// 'html' is used for the "Text" editor tab.
if ( 'html' !== $default_editor ) {
$default_editor = 'tinymce';
}
$buttons .= '<button type="button" id="' . $editor_id_attr . '-tmce" class="wp-switch-editor switch-tmce"' .
' data-wp-editor-id="' . $editor_id_attr . '">' . __('Visual') . "</button>\n";
$buttons .= '<button type="button" id="' . $editor_id_attr . '-html" class="wp-switch-editor switch-html"' .
' data-wp-editor-id="' . $editor_id_attr . '">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</button>\n";
} else {
$default_editor = 'tinymce';
}
}
$switch_class = 'html' === $default_editor ? 'html-active' : 'tmce-active';
$wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
if ( $set['_content_editor_dfw'] ) {
$wrap_class .= ' has-dfw';
}
echo '<div id="wp-' . $editor_id . '-wrap" class="' . $wrap_class . '">';
echo '<div id="wp-' . $editor_id_attr . '-wrap" class="' . $wrap_class . '">';
if ( self::$editor_buttons_css ) {
wp_print_styles('editor-buttons');
wp_print_styles( 'editor-buttons' );
self::$editor_buttons_css = false;
}
if ( !empty($set['editor_css']) )
if ( ! empty( $set['editor_css'] ) ) {
echo $set['editor_css'] . "\n";
}
if ( !empty($buttons) || $set['media_buttons'] ) {
echo '<div id="wp-' . $editor_id . '-editor-tools" class="wp-editor-tools hide-if-no-js">';
if ( ! empty( $buttons ) || $set['media_buttons'] ) {
echo '<div id="wp-' . $editor_id_attr . '-editor-tools" class="wp-editor-tools hide-if-no-js">';
if ( $set['media_buttons'] ) {
self::$has_medialib = true;
if ( !function_exists('media_buttons') )
include(ABSPATH . 'wp-admin/includes/media.php');
if ( ! function_exists( 'media_buttons' ) )
include( ABSPATH . 'wp-admin/includes/media.php' );
echo '<div id="wp-' . $editor_id . '-media-buttons" class="wp-media-buttons">';
echo '<div id="wp-' . $editor_id_attr . '-media-buttons" class="wp-media-buttons">';
/**
* Fires after the default media button(s) are displayed.
@ -224,6 +227,18 @@ final class _WP_Editors {
echo "</div>\n";
}
$quicktags_toolbar = '';
if ( self::$this_quicktags ) {
if ( 'content' === $editor_id && ! empty( $GLOBALS['current_screen'] ) && $GLOBALS['current_screen']->base === 'post' ) {
$toolbar_id = 'ed_toolbar';
} else {
$toolbar_id = 'qt_' . $editor_id_attr . '_toolbar';
}
$quicktags_toolbar = '<div id="' . $toolbar_id . '" class="quicktags-toolbar"></div>';
}
/**
* Filter the HTML markup output that displays the editor.
*
@ -231,9 +246,10 @@ final class _WP_Editors {
*
* @param string $output Editor's HTML markup.
*/
$the_editor = apply_filters( 'the_editor', '<div id="wp-' . $editor_id . '-editor-container" class="wp-editor-container">' .
'<textarea' . $editor_class . $height . $tabindex . $autocomplete . ' cols="40" name="' . $set['textarea_name'] . '" ' .
'id="' . $editor_id . '">%s</textarea></div>' );
$the_editor = apply_filters( 'the_editor', '<div id="wp-' . $editor_id_attr . '-editor-container" class="wp-editor-container">' .
$quicktags_toolbar .
'<textarea' . $editor_class . $height . $tabindex . $autocomplete . ' cols="40" name="' . esc_attr( $set['textarea_name'] ) . '" ' .
'id="' . $editor_id_attr . '">%s</textarea></div>' );
/**
* Filter the default editor content.
@ -242,12 +258,22 @@ final class _WP_Editors {
*
* @param string $content Default editor content.
*/
$content = apply_filters( 'the_editor_content', $content );
$content = apply_filters( 'the_editor_content', $content, $default_editor );
// Back-compat for the `htmledit_pre` and `richedit_pre` filters
if ( 'html' === $default_editor && has_filter( 'htmledit_pre' ) ) {
// TODO: needs _deprecated_filter(), use _deprecated_function() as substitute for now
_deprecated_function( 'add_filter( htmledit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
$content = apply_filters( 'htmledit_pre', $content );
} elseif ( 'tinymce' === $default_editor && has_filter( 'richedit_pre' ) ) {
_deprecated_function( 'add_filter( richedit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
$content = apply_filters( 'richedit_pre', $content );
}
printf( $the_editor, $content );
echo "\n</div>\n\n";
self::editor_settings($editor_id, $set);
self::editor_settings( $editor_id, $set );
}
/**
@ -478,21 +504,21 @@ final class _WP_Editors {
'theme' => 'modern',
'skin' => 'lightgray',
'language' => self::$mce_locale,
'formats' => "{
alignleft: [
{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'left'}},
{selector: 'img,table,dl.wp-caption', classes: 'alignleft'}
],
aligncenter: [
{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'center'}},
{selector: 'img,table,dl.wp-caption', classes: 'aligncenter'}
],
alignright: [
{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'right'}},
{selector: 'img,table,dl.wp-caption', classes: 'alignright'}
],
strikethrough: {inline: 'del'}
}",
'formats' => '{' .
'alignleft: [' .
'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"left"}},' .
'{selector: "img,table,dl.wp-caption", classes: "alignleft"}' .
'],' .
'aligncenter: [' .
'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"center"}},' .
'{selector: "img,table,dl.wp-caption", classes: "aligncenter"}' .
'],' .
'alignright: [' .
'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"right"}},' .
'{selector: "img,table,dl.wp-caption", classes: "alignright"}' .
'],' .
'strikethrough: {inline: "del"}' .
'}',
'relative_urls' => false,
'remove_script_host' => false,
'convert_urls' => false,
@ -650,8 +676,8 @@ final class _WP_Editors {
'body_class' => $body_class
);
if ( $first_run )
$mceInit = array_merge( self::$first_init, $mceInit );
// Merge with the first part of the init array
$mceInit = array_merge( self::$first_init, $mceInit );
if ( is_array( $set['tinymce'] ) )
$mceInit = array_merge( $mceInit, $set['tinymce'] );
@ -662,7 +688,7 @@ final class _WP_Editors {
* before tinyMCE.init. Setting "valid_elements", "invalid_elements"
* and "extended_valid_elements" can be done through this filter. Best
* is to use the default cleanup by not specifying valid_elements,
* as TinyMCE contains full set of XHTML 1.0.
* as TinyMCE checks against the full set of HTML 5.0 elements and attributes.
*/
if ( $set['teeny'] ) {
@ -1182,54 +1208,29 @@ final class _WP_Editors {
?>
( function() {
var init, edId, qtId, firstInit, wrapper;
var init, id, $wrap;
if ( typeof tinymce !== 'undefined' ) {
for ( edId in tinyMCEPreInit.mceInit ) {
if ( firstInit ) {
init = tinyMCEPreInit.mceInit[edId] = tinymce.extend( {}, firstInit, tinyMCEPreInit.mceInit[edId] );
} else {
init = firstInit = tinyMCEPreInit.mceInit[edId];
}
for ( id in tinyMCEPreInit.mceInit ) {
init = tinyMCEPreInit.mceInit[id];
$wrap = tinymce.$( '#wp-' + id + '-wrap' );
wrapper = tinymce.DOM.select( '#wp-' + edId + '-wrap' )[0];
if ( ( $wrap.hasClass( 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( id ) ) && ! init.wp_skip_init ) {
tinymce.init( init );
if ( ( tinymce.DOM.hasClass( wrapper, 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( edId ) ) &&
! init.wp_skip_init ) {
try {
tinymce.init( init );
if ( ! window.wpActiveEditor ) {
window.wpActiveEditor = edId;
}
} catch(e){}
if ( ! window.wpActiveEditor ) {
window.wpActiveEditor = id;
}
}
}
}
if ( typeof quicktags !== 'undefined' ) {
for ( qtId in tinyMCEPreInit.qtInit ) {
try {
quicktags( tinyMCEPreInit.qtInit[qtId] );
for ( id in tinyMCEPreInit.qtInit ) {
quicktags( tinyMCEPreInit.qtInit[id] );
if ( ! window.wpActiveEditor ) {
window.wpActiveEditor = qtId;
}
} catch(e){};
}
}
if ( typeof jQuery !== 'undefined' ) {
jQuery('.wp-editor-wrap').on( 'click.wp-editor', function() {
if ( this.id ) {
window.wpActiveEditor = this.id.slice( 3, -5 );
}
});
} else {
for ( qtId in tinyMCEPreInit.qtInit ) {
document.getElementById( 'wp-' + qtId + '-wrap' ).onclick = function() {
window.wpActiveEditor = this.id.slice( 3, -5 );
if ( ! window.wpActiveEditor ) {
window.wpActiveEditor = id;
}
}
}

2
wp-includes/css/editor-rtl.css
View File

@ -286,7 +286,6 @@ div.mce-path {
.mce-path-item,
.mce-path .mce-divider {
font-size: 12px;
line-height: 18px;
}
.mce-toolbar .mce-btn,
@ -1059,6 +1058,7 @@ i.mce-i-wp_code:before {
position: relative;
border-bottom: 1px solid #dedede;
background: #f5f5f5;
min-height: 30px;
}
.has-dfw .quicktags-toolbar {

2
wp-includes/css/editor-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/css/editor.css
View File

@ -286,7 +286,6 @@ div.mce-path {
.mce-path-item,
.mce-path .mce-divider {
font-size: 12px;
line-height: 18px;
}
.mce-toolbar .mce-btn,
@ -1059,6 +1058,7 @@ i.mce-i-wp_code:before {
position: relative;
border-bottom: 1px solid #dedede;
background: #f5f5f5;
min-height: 30px;
}
.has-dfw .quicktags-toolbar {

2
wp-includes/css/editor.min.css vendored
View File

File diff suppressed because one or more lines are too long

3
wp-includes/default-filters.php
View File

@ -203,6 +203,9 @@ add_filter( 'title_save_pre', 'trim' );
add_filter( 'http_request_host_is_external', 'allowed_http_request_hosts', 10, 2 );
// Prepare the content for the Visual or Text editor
add_filter( 'the_editor_content', 'format_for_editor', 10, 2 );
// Actions
add_action( 'wp_head', '_wp_render_title_tag', 1 );
add_action( 'wp_head', 'wp_enqueue_scripts', 1 );

72
wp-includes/deprecated.php
View File

@ -3491,3 +3491,75 @@ function url_is_accessable_via_ssl( $url ) {
return false;
}
/**
* Formats text for the rich text editor.
*
* The filter 'richedit_pre' is applied here. If $text is empty the filter will
* be applied to an empty string.
*
* @since 2.0.0
* @deprecated 4.3.0
*
* @param string $text The text to be formatted.
* @return string The formatted text after filter is applied.
*/
function wp_richedit_pre($text) {
_deprecated_function( __FUNCTION__, '4.3', 'format_for_editor()' );
if ( empty( $text ) ) {
/**
* Filter text returned for the rich text editor.
*
* This filter is first evaluated, and the value returned, if an empty string
* is passed to wp_richedit_pre(). If an empty string is passed, it results
* in a break tag and line feed.
*
* If a non-empty string is passed, the filter is evaluated on the wp_richedit_pre()
* return after being formatted.
*
* @since 2.0.0
* @deprecated 4.3.0
*
* @param string $output Text for the rich text editor.
*/
return apply_filters( 'richedit_pre', '' );
}
$output = convert_chars($text);
$output = wpautop($output);
$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
/** This filter is documented in wp-includes/deprecated.php */
return apply_filters( 'richedit_pre', $output );
}
/**
* Formats text for the HTML editor.
*
* Unless $output is empty it will pass through htmlspecialchars before the
* 'htmledit_pre' filter is applied.
*
* @since 2.5.0
* @deprecated 4.3.0
*
* @param string $output The text to be formatted.
* @return string Formatted text after filter applied.
*/
function wp_htmledit_pre($output) {
_deprecated_function( __FUNCTION__, '4.3', 'format_for_editor()' );
if ( !empty($output) )
$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
/**
* Filter the text before it is formatted for the HTML editor.
*
* @since 2.5.0
* @deprecated 4.3.0
*
* @param string $output The HTML-formatted text.
*/
return apply_filters( 'htmledit_pre', $output );
}

67
wp-includes/formatting.php
View File

@ -3062,66 +3062,35 @@ function ent2ncr( $text ) {
}
/**
* Formats text for the rich text editor.
* Formats text for the editor.
*
* The filter 'richedit_pre' is applied here. If $text is empty the filter will
* be applied to an empty string.
* Generally the browsers treat everything inside a textarea as text, but
* it is still a good idea to HTML entity encode `<`, `>` and `&` in the content.
*
* @since 2.0.0
* The filter 'format_for_editor' is applied here. If $text is empty the filter will
* be applied to an empty string.
*
* @since 4.3.0
*
* @param string $text The text to be formatted.
* @return string The formatted text after filter is applied.
* @return string The formatted text after filter is applied. <?
*/
function wp_richedit_pre( $text ) {
if ( empty( $text ) ) {
/**
* Filter text returned for the rich text editor.
*
* This filter is first evaluated, and the value returned, if an empty string
* is passed to wp_richedit_pre(). If an empty string is passed, it results
* in a break tag and line feed.
*
* If a non-empty string is passed, the filter is evaluated on the wp_richedit_pre()
* return after being formatted.
*
* @since 2.0.0
*
* @param string $output Text for the rich text editor.
*/
return apply_filters( 'richedit_pre', '' );
function format_for_editor( $text, $default_editor = null ) {
// Back-compat: check if any characters need encoding.
if ( ! empty( $text ) && ( false !== strpos( $text, '<' ) || false !== strpos( $text, '>' ) ||
preg_match( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', $text ) ) ) {
$text = htmlspecialchars( $text, ENT_NOQUOTES, get_option( 'blog_charset' ) );
}
$output = convert_chars($text);
$output = wpautop($output);
$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
/** This filter is documented in wp-includes/formatting.php */
return apply_filters( 'richedit_pre', $output );
}
/**
* Formats text for the HTML editor.
*
* Unless $output is empty it will pass through htmlspecialchars before the
* 'htmledit_pre' filter is applied.
*
* @since 2.5.0
*
* @param string $output The text to be formatted.
* @return string Formatted text after filter applied.
*/
function wp_htmledit_pre( $output ) {
if ( !empty($output) )
$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
/**
* Filter the text before it is formatted for the HTML editor.
* Filter the text after it is formatted for the editor.
*
* @since 2.5.0
* @since 4.3.0
*
* @param string $output The HTML-formatted text.
* @param string $text The formatted text.
*/
return apply_filters( 'htmledit_pre', $output );
return apply_filters( 'format_for_editor', $text, $default_editor );
}
/**

33
wp-includes/js/quicktags.js
View File

@ -163,7 +163,7 @@ function edButton(id, display, tagStart, tagEnd, access) {
id = settings.id,
canvas = document.getElementById(id),
name = 'qt_' + id,
tb, onclick, toolbar_id;
tb, onclick, toolbar_id, wrap, setActiveEditor;
if ( !id || !canvas ) {
return false;
@ -182,12 +182,13 @@ function edButton(id, display, tagStart, tagEnd, access) {
toolbar_id = name + '_toolbar';
}
tb = document.createElement('div');
tb.id = toolbar_id;
tb.className = 'quicktags-toolbar';
tb.onclick = function() {
window.wpActiveEditor = id;
};
tb = document.getElementById( toolbar_id );
if ( ! tb ) {
tb = document.createElement('div');
tb.id = toolbar_id;
tb.className = 'quicktags-toolbar';
}
canvas.parentNode.insertBefore(tb, canvas);
t.toolbar = tb;
@ -214,10 +215,24 @@ function edButton(id, display, tagStart, tagEnd, access) {
}
};
setActiveEditor = function() {
window.wpActiveEditor = id;
};
wrap = document.getElementById( 'wp-' + id + '-wrap' );
if ( tb.addEventListener ) {
tb.addEventListener('click', onclick, false);
tb.addEventListener( 'click', onclick, false );
if ( wrap ) {
wrap.addEventListener( 'click', setActiveEditor, false );
}
} else if ( tb.attachEvent ) {
tb.attachEvent('onclick', onclick);
tb.attachEvent( 'onclick', onclick );
if ( wrap ) {
wrap.attachEvent( 'onclick', setActiveEditor );
}
}
t.getButton = function(id) {

2
wp-includes/js/quicktags.min.js vendored
View File

File diff suppressed because one or more lines are too long

88
wp-includes/js/tinymce/plugins/wordpress/plugin.js
View File

@ -1,16 +1,19 @@
/* global tinymce, getUserSetting, setUserSetting */
/* global getUserSetting, setUserSetting */
( function( tinymce ) {
// Set the minimum value for the modals z-index higher than #wpadminbar (100000)
tinymce.ui.FloatPanel.zIndex = 100100;
tinymce.PluginManager.add( 'wordpress', function( editor ) {
var DOM = tinymce.DOM,
var wpAdvButton, style,
DOM = tinymce.DOM,
each = tinymce.each,
__ = editor.editorManager.i18n.translate,
wpAdvButton, style;
$ = window.jQuery,
wp = window.wp,
hasWpautop = ( wp && wp.editor && wp.editor.autop && editor.getParam( 'wpautop', true ) );
if ( typeof window.jQuery !== 'undefined' ) {
window.jQuery( document ).triggerHandler( 'tinymce-editor-setup', [ editor ] );
if ( $ ) {
$( document ).triggerHandler( 'tinymce-editor-setup', [ editor ] );
}
function toggleToolbars( state ) {
@ -88,26 +91,34 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
});
// Replace Read More/Next Page tags with images
editor.on( 'BeforeSetContent', function( e ) {
var title;
editor.on( 'BeforeSetContent', function( event ) {
var title,
paragraph = tinymce.Env.webkit ? '<p><br /></p>' : '<p></p>';
if ( e.content ) {
if ( e.content.indexOf( '<!--more' ) !== -1 ) {
if ( event.content ) {
if ( event.content.indexOf( '<!--more' ) !== -1 ) {
title = __( 'Read more...' );
e.content = e.content.replace( /<!--more(.*?)-->/g, function( match, moretext ) {
event.content = event.content.replace( /<!--more(.*?)-->/g, function( match, moretext ) {
return '<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="more" data-wp-more-text="' + moretext + '" ' +
'class="wp-more-tag mce-wp-more" title="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />';
});
}
if ( e.content.indexOf( '<!--nextpage-->' ) !== -1 ) {
if ( event.content.indexOf( '<!--nextpage-->' ) !== -1 ) {
title = __( 'Page break' );
e.content = e.content.replace( /<!--nextpage-->/g,
event.content = event.content.replace( /<!--nextpage-->/g,
'<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="nextpage" class="wp-more-tag mce-wp-nextpage" ' +
'title="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />' );
}
// Remove spaces from empty paragraphs.
event.content = event.content.replace( /<p>(?:&nbsp;|\u00a0|\uFEFF|\s)+<\/p>/gi, paragraph );
if ( event.load && event.format !== 'raw' && hasWpautop ) {
event.content = wp.editor.autop( event.content );
}
}
});
@ -201,7 +212,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
});
editor.addCommand( 'WP_Medialib', function() {
if ( typeof wp !== 'undefined' && wp.media && wp.media.editor ) {
if ( wp && wp.media && wp.media.editor ) {
wp.media.editor.open( editor.id );
}
});
@ -234,7 +245,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
// Menubar
// Insert->Add Media
if ( typeof wp !== 'undefined' && wp.media && wp.media.editor ) {
if ( wp && wp.media && wp.media.editor ) {
editor.addMenuItem( 'add_media', {
text: 'Add Media',
icon: 'wp-media-library',
@ -288,7 +299,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
doc = editor.getDoc(),
dom = editor.dom;
if ( tinymce.Env.iOS ) {
if ( env.iOS ) {
dom.addClass( doc.documentElement, 'ios' );
}
@ -318,23 +329,22 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
});
// Remove invalid parent paragraphs when inserting HTML
// TODO: still needed?
editor.on( 'BeforeSetContent', function( e ) {
if ( e.content ) {
e.content = e.content.replace(/<p>\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi, '<$1$2>');
e.content = e.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi, '</$1>');
editor.on( 'BeforeSetContent', function( event ) {
if ( event.content ) {
event.content = event.content.replace( /<p>\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre)( [^>]*)?>/gi, '<$1$2>' )
.replace( /<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre)>\s*<\/p>/gi, '</$1>' );
}
});
if ( typeof window.jQuery !== 'undefined' ) {
window.jQuery( document ).triggerHandler( 'tinymce-editor-init', [editor] );
if ( $ ) {
$( document ).triggerHandler( 'tinymce-editor-init', [editor] );
}
if ( window.tinyMCEPreInit && window.tinyMCEPreInit.dragDropUpload ) {
dom.bind( doc, 'dragstart dragend dragover drop', function( event ) {
if ( typeof window.jQuery !== 'undefined' ) {
if ( $ ) {
// Trigger the jQuery handlers.
window.jQuery( document ).trigger( new window.jQuery.Event( event ) );
$( document ).trigger( new $.Event( event ) );
}
});
}
@ -362,27 +372,18 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
}
});
editor.on( 'SaveContent', function( e ) {
editor.on( 'SaveContent', function( event ) {
// If editor is hidden, we just want the textarea's value to be saved
if ( ! editor.inline && editor.isHidden() ) {
e.content = e.element.value;
event.content = event.element.value;
return;
}
// Keep empty paragraphs :(
e.content = e.content.replace( /<p>(?:<br ?\/?>|\u00a0|\uFEFF| )*<\/p>/g, '<p>&nbsp;</p>' );
event.content = event.content.replace( /<p>(?:<br ?\/?>|\u00a0|\uFEFF| )*<\/p>/g, '<p>&nbsp;</p>' );
if ( editor.getParam( 'wpautop', true ) && typeof window.switchEditors !== 'undefined' ) {
e.content = window.switchEditors.pre_wpautop( e.content );
}
});
// Remove spaces from empty paragraphs.
editor.on( 'BeforeSetContent', function( event ) {
var paragraph = tinymce.Env.webkit ? '<p><br /></p>' : '<p></p>';
if ( event.content ) {
event.content = event.content.replace( /<p>(?:&nbsp;|\u00a0|\uFEFF|\s)+<\/p>/gi, paragraph );
if ( hasWpautop ) {
event.content = wp.editor.removep( event.content );
}
});
@ -394,6 +395,11 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
editor.settings.height = 300;
}
// Start hidden when the Text editor is set to load first.
if ( tinymce.$( '#wp-' + editor.id + '-wrap' ).hasClass( 'html-active' ) ) {
editor.hide();
}
each( {
c: 'JustifyCenter',
r: 'JustifyRight',
@ -415,7 +421,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
} );
editor.addShortcut( 'meta+s', '', function() {
if ( typeof wp !== 'undefined' && wp.autosave ) {
if ( wp && wp.autosave ) {
wp.autosave.server.triggerSave();
}
} );
@ -737,3 +743,5 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
_getEmbed: noop
};
});
}( window.tinymce ));

2
wp-includes/js/tinymce/plugins/wordpress/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.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-alpha-32898';
$wp_version = '4.3-alpha-32899';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.