Index: src/wp-admin/css/edit.css =================================================================== --- src/wp-admin/css/edit.css (revision 32784) +++ src/wp-admin/css/edit.css (working copy) @@ -425,6 +425,10 @@ 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; Index: src/wp-admin/js/editor.js =================================================================== --- src/wp-admin/js/editor.js (revision 32784) +++ src/wp-admin/js/editor.js (working copy) @@ -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 @@ 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]; + + if ( 'toggle' === mode ) { + if ( editor && ! editor.isHidden() ) { + mode = 'html'; + } else { + mode = 'tmce'; + } } - editorHeight = txtarea_el ? parseInt( txtarea_el.style.height, 10 ) : 0; + if ( 'tmce' === mode || 'tinymce' === mode ) { + if ( editor && ! editor.isHidden() ) { + return false; + } - if ( tinyMCEPreInit.mceInit[ id ] && tinyMCEPreInit.mceInit[ id ].wpautop ) { - txtarea_el.value = t.wpautop( txtarea_el.value ); - } + if ( typeof( window.QTags ) !== 'undefined' ) { + window.QTags.closeAllTags( id ); + } - if ( ed ) { - ed.show(); + editorHeight = parseInt( textarea.style.height, 10 ) || 0; - // No point resizing the iframe in iOS - if ( ! tinymce.Env.iOS && editorHeight ) { - toolbarHeight = getToolbarHeight(); - editorHeight = editorHeight - toolbarHeight + 14; + if ( editor ) { + editor.show(); - // height cannot be under 50 or over 5000 - if ( editorHeight > 50 && editorHeight < 5000 ) { - ed.theme.resizeTo( null, editorHeight ); + // 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 ) { + editor.theme.resizeTo( null, editorHeight ); + } } + } else { + tinymce.init( window.tinyMCEPreInit.mceInit[id] ); } - } 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' ); + wrap.removeClass( 'html-active' ).addClass( 'tmce-active' ); + $textarea.attr( 'aria-hidden', true ); + window.setUserSetting( 'editor', 'tinymce' ); - } else if ( 'html' === mode ) { + } else if ( 'html' === mode ) { + if ( editor && editor.isHidden() ) { + return false; + } - if ( ed && ed.isHidden() ) { - return false; - } + if ( editor ) { + if ( ! tinymce.Env.iOS ) { + iframe = editor.iframeElement; + editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0; - if ( ed ) { - if ( ! tinymce.Env.iOS ) { - iframe = DOM.get( id + '_ifr' ); - editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0; + if ( editorHeight ) { + toolbarHeight = getToolbarHeight( editor ); + editorHeight = editorHeight + toolbarHeight - 14; - if ( editorHeight ) { - toolbarHeight = getToolbarHeight(); - editorHeight = editorHeight + toolbarHeight - 14; - - // height cannot be under 50 or over 5000 - if ( editorHeight > 50 && editorHeight < 5000 ) { - txtarea_el.style.height = editorHeight + 'px'; + // height cannot be under 50 or over 5000 + if ( editorHeight > 50 && editorHeight < 5000 ) { + textarea.style.height = editorHeight + 'px'; + } } } - } - 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 ); + editor.hide(); + } else { + // The TinyMCE instance doesn't exist, show the textarea + $textarea.css({ 'display': '', 'visibility': '' }); } - DOM.setStyles( txtarea_el, {'display': '', 'visibility': ''} ); + wrap.removeClass( 'tmce-active' ).addClass( 'html-active' ); + $textarea.attr( 'aria-hidden', false ); + window.setUserSetting( 'editor', 'html' ); } - - 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; + // 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; - // Protect pre|script tags - if ( content.indexOf( ']*>[\s\S]+?<\/\1>/g, function( a ) { - a = a.replace( /
(\r\n|\n)?/g, '' ); - a = a.replace( /<\/?p( [^>]*)?>(\r\n|\n)?/g, '' ); - return a.replace( /\r?\n/g, '' ); - }); - } + if ( ! html ) { + return ''; + } - // keep
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( /]*)>/g, '' ).replace( /[\r\n\t]+/, '' ); - }); - } + // Protect pre|script tags + if ( html.indexOf( ']*>[\s\S]+?<\/\1>/g, function( a ) { + a = a.replace( /
(\r\n|\n)?/g, '' ); + a = a.replace( /<\/?p( [^>]*)?>(\r\n|\n)?/g, '' ); + return a.replace( /\r?\n/g, '' ); + }); + } - // 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*\\s*', 'g' ), '\n' ); - content = content.replace( new RegExp( '\\s*<((?:' + blocklist1 + ')(?: [^>]*)?)>', 'g' ), '\n<$1>' ); + // keep
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( /]*)>/g, '' ).replace( /[\r\n\t]+/, '' ); + }); + } - // Mark

if it has any attributes. - content = content.replace( /(

]+>.*?)<\/p>/g, '$1' ); + // Pretty it up for the source editor + html = html.replace( new RegExp( '\\s*\\s*', 'g' ), '\n' ); + html = html.replace( new RegExp( '\\s*<((?:' + blocklist1 + ')(?: [^>]*)?)>', 'g' ), '\n<$1>' ); - // Separate

containing

- content = content.replace( /]*)?>\s*

/gi, '\n\n' ); + // Mark

if it has any attributes. + html = html.replace( /(

]+>.*?)<\/p>/g, '$1' ); - // Remove

and
- content = content.replace( /\s*

/gi, '' ); - content = content.replace( /\s*<\/p>\s*/gi, '\n\n' ); - content = content.replace( /\n[\s\u00a0]+\n/g, '\n\n' ); - content = content.replace( /\s*
\s*/gi, '\n' ); + // Separate

containing

+ html = html.replace( /]*)?>\s*

/gi, '\n\n' ); - // Fix some block element newline issues - content = content.replace( /\s*

\s*/g, '
\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' ); + // Remove

and
+ html = html.replace( /\s*

/gi, '' ); + html = html.replace( /\s*<\/p>\s*/gi, '\n\n' ); + html = html.replace( /\n[\s\u00a0]+\n/g, '\n\n' ); + html = html.replace( /\s*
\s*/gi, '\n' ); - 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*\\s*', 'g' ), '\n' ); - content = content.replace( /]*)>/g, '\t' ); + // Fix some block element newline issues + html = html.replace( /\s*

\s*/g, '
\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' ); - if ( content.indexOf( '/g, '\n' ); - } + html = html.replace( new RegExp('\\s*<((?:' + blocklist2 + ')(?: [^>]*)?)\\s*>', 'g' ), '\n<$1>' ); + html = html.replace( new RegExp('\\s*\\s*', 'g' ), '\n' ); + html = html.replace( /]*)>/g, '\t' ); - if ( content.indexOf( ']*)?>\s*/g, '\n\n\n\n' ); - } + if ( html.indexOf( '/g, '\n' ); + } - if ( content.indexOf( '/g, function( a ) { - return a.replace( /[\r\n]+/g, '' ); - }); - } + if ( html.indexOf( ']*)?>\s*/g, '\n\n\n\n' ); + } - // Unmark special paragraph closing tags - content = content.replace( /<\/p#>/g, '

\n' ); - content = content.replace( /\s*(

]+>[\s\S]*?<\/p>)/g, '\n$1' ); + if ( html.indexOf( '/g, function( a ) { + return a.replace( /[\r\n]+/g, '' ); + }); + } - // Trim whitespace - content = content.replace( /^\s+/, '' ); - content = content.replace( /[\s\u00a0]+$/, '' ); + // Unmark special paragraph closing tags + html = html.replace( /<\/p#>/g, '

\n' ); + html = html.replace( /\s*(

]+>[\s\S]*?<\/p>)/g, '\n$1' ); - // put back the line breaks in pre|script - if ( preserve_linebreaks ) { - content = content.replace( //g, '\n' ); - } + // Trim whitespace + html = html.replace( /^\s+/, '' ); + html = html.replace( /[\s\u00a0]+$/, '' ); - // and the
tags in captions - if ( preserve_br ) { - content = content.replace( /]*)>/g, '' ); + // put back the line breaks in pre|script + if ( preserve_linebreaks ) { + html = html.replace( //g, '\n' ); + } + + // and the
tags in captions + if ( preserve_br ) { + html = html.replace( /]*)>/g, '' ); + } + + return html; } - return content; - }, + // 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'; - _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'; + // Normalize line breaks + text = text.replace( /\r\n|\r/g, '\n' ); - if ( pee.indexOf( '/g, function( a ) { - return a.replace( /[\r\n]+/g, '' ); - }); - } + if ( text.indexOf( '\n' ) === -1 ) { + return text; + } - pee = pee.replace( /<[^<>]+>/g, function( a ){ - return a.replace( /[\r\n]+/g, ' ' ); - }); + if ( text.indexOf( '/g, function( a ) { + return a.replace( /\n+/g, '' ); + }); + } - // Protect pre|script tags - if ( pee.indexOf( ']*>[\s\S]+?<\/\1>/g, function( a ) { - return a.replace( /(\r\n|\n)/g, '' ); + text = text.replace( /<[^<>]+>/g, function( a ) { + return a.replace( /[\n\t ]+/g, ' ' ); }); - } - // keep
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
- a = a.replace( /]*)>/g, '' ); - // 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 ( text.indexOf( ']*>[\s\S]+?<\/\1>/g, function( a ) { + return a.replace( /\n/g, '' ); }); - // convert remaining line breaks to
- return a.replace( /\s*\n\s*/g, '' ); + } + + // keep
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
+ a = a.replace( /]*)>/g, '' ); + // no line breaks inside HTML tags + a = a.replace( /<[^<>]+>/g, function( b ) { + return b.replace( /[\n\t ]+/, ' ' ); + }); + // convert remaining line breaks to
+ return a.replace( /\s*\n\s*/g, '' ); + }); + } + + text = text + '\n\n'; + text = text.replace( /
\s*
/gi, '\n\n' ); + text = text.replace( new RegExp( '(<(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '\n$1' ); + text = text.replace( new RegExp( '()', 'gi' ), '$1\n\n' ); + text = text.replace( /]*)?>/gi, '\n\n' ); // hr is self closing block element + text = text.replace( /\s*' ); + text = text.replace( /\n\s*\n+/g, '\n\n' ); + text = text.replace( /([\s\S]+?)\n\n/g, '

$1

\n' ); + text = text.replace( /

\s*?<\/p>/gi, ''); + text = text.replace( new RegExp( '

\\s*(]*)?>)\\s*

', 'gi' ), '$1' ); + text = text.replace( /

(/gi, '$1'); + text = text.replace( /

\s*]*)>/gi, '

'); + text = text.replace( /<\/blockquote>\s*<\/p>/gi, '

'); + text = text.replace( new RegExp( '

\\s*(]*)?>)', 'gi' ), '$1' ); + text = text.replace( new RegExp( '(]*)?>)\\s*

', 'gi' ), '$1' ); + text = text.replace( /\s*\n/gi, '
\n'); + text = text.replace( new RegExp( '(]*>)\\s*
', 'gi' ), '$1' ); + text = text.replace( /
(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi, '$1' ); + text = text.replace( /(?:

|
)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|
)*/gi, '[caption$1[/caption]' ); + + text = text.replace( /(<(?:div|th|td|form|fieldset|dd)[^>]*>)(.*?)<\/p>/g, function( a, b, c ) { + if ( c.match( /]*)?>/ ) ) { + return a; + } + + return b + '

' + c + '

'; }); - } - pee = pee + '\n\n'; - pee = pee.replace( /
\s*
/gi, '\n\n' ); - pee = pee.replace( new RegExp( '(<(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '\n$1' ); - pee = pee.replace( new RegExp( '()', 'gi' ), '$1\n\n' ); - pee = pee.replace( /]*)?>/gi, '\n\n' ); // hr is self closing block element - pee = pee.replace( /\s*' ); - 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, '

$1

\n' ); - pee = pee.replace( /

\s*?<\/p>/gi, ''); - pee = pee.replace( new RegExp( '

\\s*(]*)?>)\\s*

', 'gi' ), '$1' ); - pee = pee.replace( /

(/gi, '$1'); - pee = pee.replace( /

\s*]*)>/gi, '

'); - pee = pee.replace( /<\/blockquote>\s*<\/p>/gi, '

'); - pee = pee.replace( new RegExp( '

\\s*(]*)?>)', 'gi' ), '$1' ); - pee = pee.replace( new RegExp( '(]*)?>)\\s*

', 'gi' ), '$1' ); - pee = pee.replace( /\s*\n/gi, '
\n'); - pee = pee.replace( new RegExp( '(]*>)\\s*
', 'gi' ), '$1' ); - pee = pee.replace( /
(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi, '$1' ); - pee = pee.replace( /(?:

|
)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|
)*/gi, '[caption$1[/caption]' ); + // put back the line breaks in pre|script + if ( preserve_linebreaks ) { + text = text.replace( //g, '\n' ); + } - pee = pee.replace( /(<(?:div|th|td|form|fieldset|dd)[^>]*>)(.*?)<\/p>/g, function( a, b, c ) { - if ( c.match( /]*)?>/ ) ) { - return a; + if ( preserve_br ) { + text = text.replace( /]*)>/g, '' ); } - return b + '

' + c + '

'; - }); - - // put back the line breaks in pre|script - if ( preserve_linebreaks ) { - pee = pee.replace( //g, '\n' ); + return text; } - if ( preserve_br ) { - pee = pee.replace( /]*)>/g, '' ); - } + // Add old events + function pre_wpautop( html ) { + var obj = { o: exports, data: html, unfiltered: html }; - return pee; - }, + if ( $ ) { + $( 'body' ).trigger( 'beforePreWpautop', [ obj ] ); + } - pre_wpautop: function( content ) { - var t = this, o = { o: t, data: content, unfiltered: content }, - q = typeof( jQuery ) !== 'undefined'; + obj.data = removep( obj.data ); - if ( q ) { - jQuery( 'body' ).trigger( 'beforePreWpautop', [ o ] ); + 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 ] ); + } - return o.data; - }, + obj.data = autop( obj.data ); - wpautop: function( pee ) { - var t = this, o = { o: t, data: pee, unfiltered: pee }, - q = typeof( jQuery ) !== 'undefined'; + if ( $ ) { + $( 'body' ).trigger( 'afterWpautop', [ obj ] ); + } - if ( q ) { - jQuery( 'body' ).trigger('beforeWpautop', [ o ] ); + return obj.data; } - o.data = t._wp_Autop( o.data ); - - if ( q ) { - jQuery( 'body' ).trigger('afterWpautop', [ 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(); + } + } ); } - return o.data; + window.wp = window.wp || {}; + window.wp.editor = window.wp.editor || {}; + window.wp.editor.autop = wpautop; + window.wp.editor.removep = pre_wpautop; + + exports = { + go: switchEditor, + wpautop: wpautop, + pre_wpautop: pre_wpautop, + _wp_Autop: autop, + _wp_Nop: removep + }; + + return exports; } -}; + + window.switchEditors = new SwitchEditors(); +}( window.jQuery )); Index: src/wp-includes/class-wp-editor.php =================================================================== --- src/wp-includes/class-wp-editor.php (revision 32784) +++ src/wp-includes/class-wp-editor.php (working copy) @@ -143,45 +143,47 @@ * @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 ( ! 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' ) ) + if ( ! current_user_can( 'upload_files' ) ) { $set['media_buttons'] = false; + } - if ( ! self::$this_quicktags && self::$this_tinymce ) { - $switch_class = 'tmce-active'; + if ( self::$this_tinymce ) { $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'; + 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 .= '\n"; + $buttons .= '\n"; } else { - add_filter('the_editor_content', 'wp_richedit_pre'); - $switch_class = 'tmce-active'; + $default_editor = 'tinymce'; } - - $buttons .= '\n"; - $buttons .= '\n"; } + $switch_class = 'html' === $default_editor ? 'html-active' : 'tmce-active'; $wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class; if ( $set['_content_editor_dfw'] ) { @@ -188,26 +190,27 @@ $wrap_class .= ' has-dfw'; } - echo '
'; + echo '
'; 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 '
'; + if ( ! empty( $buttons ) || $set['media_buttons'] ) { + echo '
'; 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 '
'; + echo '
'; /** * Fires after the default media button(s) are displayed. @@ -224,6 +227,18 @@ echo "
\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 = '
'; + } + /** * Filter the HTML markup output that displays the editor. * @@ -231,9 +246,10 @@ * * @param string $output Editor's HTML markup. */ - $the_editor = apply_filters( 'the_editor', '
' . - '%s
' ); + $the_editor = apply_filters( 'the_editor', '
' . + $quicktags_toolbar . + '%s
' ); /** * Filter the default editor content. @@ -242,12 +258,22 @@ * * @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
\n\n"; - self::editor_settings($editor_id, $set); + self::editor_settings( $editor_id, $set ); } /** @@ -478,21 +504,21 @@ '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 @@ '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 @@ * 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,55 +1208,30 @@ ?> ( 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 ); + if ( ! window.wpActiveEditor ) { + window.wpActiveEditor = id; } - }); - } else { - for ( qtId in tinyMCEPreInit.qtInit ) { - document.getElementById( 'wp-' + qtId + '-wrap' ).onclick = function() { - window.wpActiveEditor = this.id.slice( 3, -5 ); - } } } }()); Index: src/wp-includes/css/editor.css =================================================================== --- src/wp-includes/css/editor.css (revision 32784) +++ src/wp-includes/css/editor.css (working copy) @@ -286,7 +286,6 @@ .mce-path-item, .mce-path .mce-divider { font-size: 12px; - line-height: 18px; } .mce-toolbar .mce-btn, @@ -1059,6 +1058,7 @@ position: relative; border-bottom: 1px solid #dedede; background: #f5f5f5; + min-height: 30px; } .has-dfw .quicktags-toolbar { Index: src/wp-includes/default-filters.php =================================================================== --- src/wp-includes/default-filters.php (revision 32784) +++ src/wp-includes/default-filters.php (working copy) @@ -202,6 +202,9 @@ 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 ); Index: src/wp-includes/deprecated.php =================================================================== --- src/wp-includes/deprecated.php (revision 32784) +++ src/wp-includes/deprecated.php (working copy) @@ -3491,3 +3491,75 @@ 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 ); +} + Index: src/wp-includes/formatting.php =================================================================== --- src/wp-includes/formatting.php (revision 32784) +++ src/wp-includes/formatting.php (working copy) @@ -3001,66 +3001,35 @@ } /** - * 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. ' ) || + 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 ); } /** Index: src/wp-includes/js/quicktags.js =================================================================== --- src/wp-includes/js/quicktags.js (revision 32784) +++ src/wp-includes/js/quicktags.js (working copy) @@ -163,7 +163,7 @@ 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,13 +182,14 @@ 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 @@ } }; + 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) { Index: src/wp-includes/js/tinymce/plugins/wordpress/plugin.js =================================================================== --- src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (revision 32784) +++ src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (working copy) @@ -1,754 +1,760 @@ -/* global tinymce, getUserSetting, setUserSetting */ +/* global getUserSetting, setUserSetting */ +( function( tinymce, $, wp ) { + // Set the minimum value for the modals z-index higher than #wpadminbar (100000) + tinymce.ui.FloatPanel.zIndex = 100100; -// 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, + each = tinymce.each, + __ = editor.editorManager.i18n.translate, + wpAdvButton, style, + hasWpautop = ( wp && wp.editor && wp.editor.autop && editor.getParam( 'wpautop', true ) ), + last = 0; -tinymce.PluginManager.add( 'wordpress', function( editor ) { - var DOM = tinymce.DOM, - each = tinymce.each, - __ = editor.editorManager.i18n.translate, - wpAdvButton, style, - last = 0; + if ( $ ) { + $( document ).triggerHandler( 'tinymce-editor-setup', [ editor ] ); + } - if ( typeof window.jQuery !== 'undefined' ) { - window.jQuery( document ).triggerHandler( 'tinymce-editor-setup', [ editor ] ); - } + function toggleToolbars( state ) { + var iframe, initial, toolbars, + pixels = 0; - function toggleToolbars( state ) { - var iframe, initial, toolbars, - pixels = 0; + initial = ( state === 'hide' ); - initial = ( state === 'hide' ); + if ( editor.theme.panel ) { + toolbars = editor.theme.panel.find('.toolbar:not(.menubar)'); + } - if ( editor.theme.panel ) { - toolbars = editor.theme.panel.find('.toolbar:not(.menubar)'); - } + if ( ! toolbars || toolbars.length < 2 || ( state === 'hide' && ! toolbars[1].visible() ) ) { + return; + } - if ( ! toolbars || toolbars.length < 2 || ( state === 'hide' && ! toolbars[1].visible() ) ) { - return; - } + if ( ! state && toolbars[1].visible() ) { + state = 'hide'; + } - if ( ! state && toolbars[1].visible() ) { - state = 'hide'; - } + each( toolbars, function( toolbar, i ) { + if ( i > 0 ) { + if ( state === 'hide' ) { + toolbar.hide(); + pixels += 30; + } else { + toolbar.show(); + pixels -= 30; + } + } + }); - each( toolbars, function( toolbar, i ) { - if ( i > 0 ) { + if ( pixels && ! initial ) { + // Resize iframe, not needed in iOS + if ( ! tinymce.Env.iOS ) { + iframe = editor.getContentAreaContainer().firstChild; + DOM.setStyle( iframe, 'height', iframe.clientHeight + pixels ); + } + if ( state === 'hide' ) { - toolbar.hide(); - pixels += 30; + setUserSetting('hidetb', '0'); + wpAdvButton && wpAdvButton.active( false ); } else { - toolbar.show(); - pixels -= 30; + setUserSetting('hidetb', '1'); + wpAdvButton && wpAdvButton.active( true ); } } - }); - if ( pixels && ! initial ) { - // Resize iframe, not needed in iOS - if ( ! tinymce.Env.iOS ) { - iframe = editor.getContentAreaContainer().firstChild; - DOM.setStyle( iframe, 'height', iframe.clientHeight + pixels ); + editor.fire( 'wp-toolbar-toggle' ); + } + + // Add the kitchen sink button :) + editor.addButton( 'wp_adv', { + tooltip: 'Toolbar Toggle', + cmd: 'WP_Adv', + onPostRender: function() { + wpAdvButton = this; + wpAdvButton.active( getUserSetting( 'hidetb' ) === '1' ? true : false ); } + }); - if ( state === 'hide' ) { - setUserSetting('hidetb', '0'); - wpAdvButton && wpAdvButton.active( false ); - } else { - setUserSetting('hidetb', '1'); - wpAdvButton && wpAdvButton.active( true ); + // Hide the toolbars after loading + editor.on( 'PostRender', function() { + if ( editor.getParam( 'wordpress_adv_hidden', true ) && getUserSetting( 'hidetb', '0' ) === '0' ) { + toggleToolbars( 'hide' ); } - } + }); - editor.fire( 'wp-toolbar-toggle' ); - } + editor.addCommand( 'WP_Adv', function() { + toggleToolbars(); + }); - // Add the kitchen sink button :) - editor.addButton( 'wp_adv', { - tooltip: 'Toolbar Toggle', - cmd: 'WP_Adv', - onPostRender: function() { - wpAdvButton = this; - wpAdvButton.active( getUserSetting( 'hidetb' ) === '1' ? true : false ); - } - }); + editor.on( 'focus', function() { + window.wpActiveEditor = editor.id; + }); - // Hide the toolbars after loading - editor.on( 'PostRender', function() { - if ( editor.getParam( 'wordpress_adv_hidden', true ) && getUserSetting( 'hidetb', '0' ) === '0' ) { - toggleToolbars( 'hide' ); - } - }); + // Replace Read More/Next Page tags with images + editor.on( 'BeforeSetContent', function( event ) { + var title, + paragraph = tinymce.Env.webkit ? '


' : '

'; - editor.addCommand( 'WP_Adv', function() { - toggleToolbars(); - }); + if ( event.content ) { + if ( event.content.indexOf( '/g, function( match, moretext ) { + return ''; + }); + } - // Replace Read More/Next Page tags with images - editor.on( 'BeforeSetContent', function( e ) { - var title; + if ( event.content.indexOf( '' ) !== -1 ) { + title = __( 'Page break' ); - if ( e.content ) { - if ( e.content.indexOf( '/g, + '' ); + } - e.content = e.content.replace( //g, function( match, moretext ) { - return ''; - }); + // Remove spaces from empty paragraphs. + event.content = event.content.replace( /

(?: |\u00a0|\uFEFF|\s)+<\/p>/gi, paragraph ); + + if ( event.load && event.format !== 'raw' && hasWpautop ) { + event.content = wp.editor.autop( event.content ); + } } + }); - if ( e.content.indexOf( '' ) !== -1 ) { - title = __( 'Page break' ); + // Replace images with tags + editor.on( 'PostProcess', function( e ) { + if ( e.get ) { + e.content = e.content.replace(/]+>/g, function( image ) { + var match, moretext = ''; - e.content = e.content.replace( //g, - '' ); - } - } - }); + if ( image.indexOf( 'data-wp-more="more"' ) !== -1 ) { + if ( match = image.match( /data-wp-more-text="([^"]+)"/ ) ) { + moretext = match[1]; + } - // Replace images with tags - editor.on( 'PostProcess', function( e ) { - if ( e.get ) { - e.content = e.content.replace(/]+>/g, function( image ) { - var match, moretext = ''; - - if ( image.indexOf( 'data-wp-more="more"' ) !== -1 ) { - if ( match = image.match( /data-wp-more-text="([^"]+)"/ ) ) { - moretext = match[1]; + image = ''; + } else if ( image.indexOf( 'data-wp-more="nextpage"' ) !== -1 ) { + image = ''; } - image = ''; - } else if ( image.indexOf( 'data-wp-more="nextpage"' ) !== -1 ) { - image = ''; - } + return image; + }); + } + }); - return image; - }); - } - }); + // Display the tag name instead of img in element path + editor.on( 'ResolveName', function( event ) { + var attr; - // Display the tag name instead of img in element path - editor.on( 'ResolveName', function( event ) { - var attr; + if ( event.target.nodeName === 'IMG' && ( attr = editor.dom.getAttrib( event.target, 'data-wp-more' ) ) ) { + event.name = attr; + } + }); - if ( event.target.nodeName === 'IMG' && ( attr = editor.dom.getAttrib( event.target, 'data-wp-more' ) ) ) { - event.name = attr; - } - }); + // Register commands + editor.addCommand( 'WP_More', function( tag ) { + var parent, html, title, + classname = 'wp-more-tag', + dom = editor.dom, + node = editor.selection.getNode(); - // Register commands - editor.addCommand( 'WP_More', function( tag ) { - var parent, html, title, - classname = 'wp-more-tag', - dom = editor.dom, - node = editor.selection.getNode(); + tag = tag || 'more'; + classname += ' mce-wp-' + tag; + title = tag === 'more' ? 'Read more...' : 'Next page'; + title = __( title ); + html = ''; - tag = tag || 'more'; - classname += ' mce-wp-' + tag; - title = tag === 'more' ? 'Read more...' : 'Next page'; - title = __( title ); - html = ''; + // Most common case + if ( node.nodeName === 'BODY' || ( node.nodeName === 'P' && node.parentNode.nodeName === 'BODY' ) ) { + editor.insertContent( html ); + return; + } - // Most common case - if ( node.nodeName === 'BODY' || ( node.nodeName === 'P' && node.parentNode.nodeName === 'BODY' ) ) { - editor.insertContent( html ); - return; - } + // Get the top level parent node + parent = dom.getParent( node, function( found ) { + if ( found.parentNode && found.parentNode.nodeName === 'BODY' ) { + return true; + } - // Get the top level parent node - parent = dom.getParent( node, function( found ) { - if ( found.parentNode && found.parentNode.nodeName === 'BODY' ) { - return true; - } + return false; + }, editor.getBody() ); - return false; - }, editor.getBody() ); + if ( parent ) { + if ( parent.nodeName === 'P' ) { + parent.appendChild( dom.create( 'p', null, html ).firstChild ); + } else { + dom.insertAfter( dom.create( 'p', null, html ), parent ); + } - if ( parent ) { - if ( parent.nodeName === 'P' ) { - parent.appendChild( dom.create( 'p', null, html ).firstChild ); - } else { - dom.insertAfter( dom.create( 'p', null, html ), parent ); + editor.nodeChanged(); } + }); - editor.nodeChanged(); - } - }); + editor.addCommand( 'WP_Code', function() { + editor.formatter.toggle('code'); + }); - editor.addCommand( 'WP_Code', function() { - editor.formatter.toggle('code'); - }); + editor.addCommand( 'WP_Page', function() { + editor.execCommand( 'WP_More', 'nextpage' ); + }); - editor.addCommand( 'WP_Page', function() { - editor.execCommand( 'WP_More', 'nextpage' ); - }); + editor.addCommand( 'WP_Help', function() { + editor.windowManager.open({ + url: tinymce.baseURL + '/wp-mce-help.php', + title: 'Keyboard Shortcuts', + width: 450, + height: 420, + classes: 'wp-help', + buttons: { text: 'Close', onclick: 'close' } + }); + }); - editor.addCommand( 'WP_Help', function() { - editor.windowManager.open({ - url: tinymce.baseURL + '/wp-mce-help.php', - title: 'Keyboard Shortcuts', - width: 450, - height: 420, - classes: 'wp-help', - buttons: { text: 'Close', onclick: 'close' } + editor.addCommand( 'WP_Medialib', function() { + if ( wp && wp.media && wp.media.editor ) { + wp.media.editor.open( editor.id ); + } }); - }); - editor.addCommand( 'WP_Medialib', function() { - if ( typeof wp !== 'undefined' && wp.media && wp.media.editor ) { - wp.media.editor.open( editor.id ); - } - }); + // Register buttons + editor.addButton( 'wp_more', { + tooltip: 'Insert Read More tag', + onclick: function() { + editor.execCommand( 'WP_More', 'more' ); + } + }); - // Register buttons - editor.addButton( 'wp_more', { - tooltip: 'Insert Read More tag', - onclick: function() { - editor.execCommand( 'WP_More', 'more' ); - } - }); + editor.addButton( 'wp_page', { + tooltip: 'Page break', + onclick: function() { + editor.execCommand( 'WP_More', 'nextpage' ); + } + }); - editor.addButton( 'wp_page', { - tooltip: 'Page break', - onclick: function() { - editor.execCommand( 'WP_More', 'nextpage' ); - } - }); + editor.addButton( 'wp_help', { + tooltip: 'Keyboard Shortcuts', + cmd: 'WP_Help' + }); - editor.addButton( 'wp_help', { - tooltip: 'Keyboard Shortcuts', - cmd: 'WP_Help' - }); + editor.addButton( 'wp_code', { + tooltip: 'Code', + cmd: 'WP_Code', + stateSelector: 'code' + }); - editor.addButton( 'wp_code', { - tooltip: 'Code', - cmd: 'WP_Code', - stateSelector: 'code' - }); + // Menubar + // Insert->Add Media + if ( wp && wp.media && wp.media.editor ) { + editor.addMenuItem( 'add_media', { + text: 'Add Media', + icon: 'wp-media-library', + context: 'insert', + cmd: 'WP_Medialib' + }); + } - // Menubar - // Insert->Add Media - if ( typeof wp !== 'undefined' && wp.media && wp.media.editor ) { - editor.addMenuItem( 'add_media', { - text: 'Add Media', - icon: 'wp-media-library', + // Insert "Read More..." + editor.addMenuItem( 'wp_more', { + text: 'Insert Read More tag', + icon: 'wp_more', context: 'insert', - cmd: 'WP_Medialib' + onclick: function() { + editor.execCommand( 'WP_More', 'more' ); + } }); - } - // Insert "Read More..." - editor.addMenuItem( 'wp_more', { - text: 'Insert Read More tag', - icon: 'wp_more', - context: 'insert', - onclick: function() { - editor.execCommand( 'WP_More', 'more' ); - } - }); + // Insert "Next Page" + editor.addMenuItem( 'wp_page', { + text: 'Page break', + icon: 'wp_page', + context: 'insert', + onclick: function() { + editor.execCommand( 'WP_More', 'nextpage' ); + } + }); - // Insert "Next Page" - editor.addMenuItem( 'wp_page', { - text: 'Page break', - icon: 'wp_page', - context: 'insert', - onclick: function() { - editor.execCommand( 'WP_More', 'nextpage' ); - } - }); + editor.on( 'BeforeExecCommand', function(e) { + if ( tinymce.Env.webkit && ( e.command === 'InsertUnorderedList' || e.command === 'InsertOrderedList' ) ) { + if ( ! style ) { + style = editor.dom.create( 'style', {'type': 'text/css'}, + '#tinymce,#tinymce span,#tinymce li,#tinymce li>span,#tinymce p,#tinymce p>span{font:medium sans-serif;color:#000;line-height:normal;}'); + } - editor.on( 'BeforeExecCommand', function(e) { - if ( tinymce.Env.webkit && ( e.command === 'InsertUnorderedList' || e.command === 'InsertOrderedList' ) ) { - if ( ! style ) { - style = editor.dom.create( 'style', {'type': 'text/css'}, - '#tinymce,#tinymce span,#tinymce li,#tinymce li>span,#tinymce p,#tinymce p>span{font:medium sans-serif;color:#000;line-height:normal;}'); + editor.getDoc().head.appendChild( style ); } + }); - editor.getDoc().head.appendChild( style ); - } - }); + editor.on( 'ExecCommand', function( e ) { + if ( tinymce.Env.webkit && style && + ( 'InsertUnorderedList' === e.command || 'InsertOrderedList' === e.command ) ) { - editor.on( 'ExecCommand', function( e ) { - if ( tinymce.Env.webkit && style && - ( 'InsertUnorderedList' === e.command || 'InsertOrderedList' === e.command ) ) { + editor.dom.remove( style ); + } + }); - editor.dom.remove( style ); - } - }); + editor.on( 'init', function() { + var env = tinymce.Env, + bodyClass = ['mceContentBody'], // back-compat for themes that use this in editor-style.css... + doc = editor.getDoc(), + dom = editor.dom; - editor.on( 'init', function() { - var env = tinymce.Env, - bodyClass = ['mceContentBody'], // back-compat for themes that use this in editor-style.css... - doc = editor.getDoc(), - dom = editor.dom; - - if ( tinymce.Env.iOS ) { - dom.addClass( doc.documentElement, 'ios' ); - } - - if ( editor.getParam( 'directionality' ) === 'rtl' ) { - bodyClass.push('rtl'); - dom.setAttrib( doc.documentElement, 'dir', 'rtl' ); - } - - if ( env.ie ) { - if ( parseInt( env.ie, 10 ) === 9 ) { - bodyClass.push('ie9'); - } else if ( parseInt( env.ie, 10 ) === 8 ) { - bodyClass.push('ie8'); - } else if ( env.ie < 8 ) { - bodyClass.push('ie7'); + if ( env.iOS ) { + dom.addClass( doc.documentElement, 'ios' ); } - } else if ( env.webkit ) { - bodyClass.push('webkit'); - } - bodyClass.push('wp-editor'); - - each( bodyClass, function( cls ) { - if ( cls ) { - dom.addClass( doc.body, cls ); + if ( editor.getParam( 'directionality' ) === 'rtl' ) { + bodyClass.push('rtl'); + dom.setAttrib( doc.documentElement, 'dir', 'rtl' ); } - }); - // Remove invalid parent paragraphs when inserting HTML - // TODO: still needed? - editor.on( 'BeforeSetContent', function( e ) { - if ( e.content ) { - e.content = e.content.replace(/

\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, ''); + if ( env.ie ) { + if ( parseInt( env.ie, 10 ) === 9 ) { + bodyClass.push('ie9'); + } else if ( parseInt( env.ie, 10 ) === 8 ) { + bodyClass.push('ie8'); + } else if ( env.ie < 8 ) { + bodyClass.push('ie7'); + } + } else if ( env.webkit ) { + bodyClass.push('webkit'); } - }); - if ( typeof window.jQuery !== 'undefined' ) { - window.jQuery( document ).triggerHandler( 'tinymce-editor-init', [editor] ); - } + bodyClass.push('wp-editor'); - if ( window.tinyMCEPreInit && window.tinyMCEPreInit.dragDropUpload ) { - dom.bind( doc, 'dragstart dragend dragover drop', function( event ) { - if ( typeof window.jQuery !== 'undefined' ) { - // Trigger the jQuery handlers. - window.jQuery( document ).trigger( new window.jQuery.Event( event ) ); + each( bodyClass, function( cls ) { + if ( cls ) { + dom.addClass( doc.body, cls ); } }); - } - if ( editor.getParam( 'wp_paste_filters', true ) ) { - if ( ! tinymce.Env.webkit ) { - // In WebKit handled by removeWebKitStyles() - editor.on( 'PastePreProcess', function( event ) { - // Remove all inline styles - event.content = event.content.replace( /(<[^>]+) style="[^"]*"([^>]*>)/gi, '$1$2' ); + // Remove invalid parent paragraphs when inserting HTML + editor.on( 'BeforeSetContent', function( event ) { + if ( event.content ) { + event.content = event.content.replace( /

\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, '' ); + } + }); - // Put back the internal styles - event.content = event.content.replace(/(<[^>]+) data-mce-style=([^>]+>)/gi, '$1 style=$2' ); - }); + if ( $ ) { + $( document ).triggerHandler( 'tinymce-editor-init', [editor] ); } - editor.on( 'PastePostProcess', function( event ) { - // Remove empty paragraphs - each( dom.select( 'p', event.node ), function( node ) { - if ( dom.isEmpty( node ) ) { - dom.remove( node ); + if ( window.tinyMCEPreInit && window.tinyMCEPreInit.dragDropUpload ) { + dom.bind( doc, 'dragstart dragend dragover drop', function( event ) { + if ( $ ) { + // Trigger the jQuery handlers. + $( document ).trigger( new $.Event( event ) ); } }); - }); - } - }); + } - // Word count - if ( typeof window.jQuery !== 'undefined' ) { - editor.on( 'keyup', function( e ) { - var key = e.keyCode || e.charCode; + if ( editor.getParam( 'wp_paste_filters', true ) ) { + if ( ! tinymce.Env.webkit ) { + // In WebKit handled by removeWebKitStyles() + editor.on( 'PastePreProcess', function( event ) { + // Remove all inline styles + event.content = event.content.replace( /(<[^>]+) style="[^"]*"([^>]*>)/gi, '$1$2' ); - if ( key === last ) { - return; - } + // Put back the internal styles + event.content = event.content.replace(/(<[^>]+) data-mce-style=([^>]+>)/gi, '$1 style=$2' ); + }); + } - if ( 13 === key || 8 === last || 46 === last ) { - window.jQuery( document ).triggerHandler( 'wpcountwords', [ editor.getContent({ format : 'raw' }) ] ); + editor.on( 'PastePostProcess', function( event ) { + // Remove empty paragraphs + each( dom.select( 'p', event.node ), function( node ) { + if ( dom.isEmpty( node ) ) { + dom.remove( node ); + } + }); + }); } - - last = key; }); - } - editor.on( 'SaveContent', function( e ) { - // If editor is hidden, we just want the textarea's value to be saved - if ( ! editor.inline && editor.isHidden() ) { - e.content = e.element.value; - return; - } + // Word count + if ( $ ) { + editor.on( 'keyup', function( e ) { + var key = e.keyCode || e.charCode; - // Keep empty paragraphs :( - e.content = e.content.replace( /

(?:
|\u00a0|\uFEFF| )*<\/p>/g, '

 

' ); + if ( key === last ) { + return; + } - if ( editor.getParam( 'wpautop', true ) && typeof window.switchEditors !== 'undefined' ) { - e.content = window.switchEditors.pre_wpautop( e.content ); + if ( 13 === key || 8 === last || 46 === last ) { + $( document ).triggerHandler( 'wpcountwords', [ editor.getContent({ format : 'raw' }) ] ); + } + + last = key; + }); } - }); - // Remove spaces from empty paragraphs. - editor.on( 'BeforeSetContent', function( event ) { - var paragraph = tinymce.Env.webkit ? '


' : '

'; + editor.on( 'SaveContent', function( event ) { + // If editor is hidden, we just want the textarea's value to be saved + if ( ! editor.inline && editor.isHidden() ) { + event.content = event.element.value; + return; + } - if ( event.content ) { - event.content = event.content.replace( /

(?: |\u00a0|\uFEFF|\s)+<\/p>/gi, paragraph ); - } - }); + // Keep empty paragraphs :( + event.content = event.content.replace( /

(?:
|\u00a0|\uFEFF| )*<\/p>/g, '

 

' ); - editor.on( 'preInit', function() { - // Don't replace with and with and don't remove them when empty - editor.schema.addValidElements( '@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b' ); + if ( hasWpautop ) { + event.content = wp.editor.removep( event.content ); + } + }); - if ( tinymce.Env.iOS ) { - editor.settings.height = 300; - } + editor.on( 'preInit', function() { + // Don't replace with and with and don't remove them when empty + editor.schema.addValidElements( '@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b' ); - each( { - c: 'JustifyCenter', - r: 'JustifyRight', - l: 'JustifyLeft', - j: 'JustifyFull', - q: 'mceBlockQuote', - u: 'InsertUnorderedList', - o: 'InsertOrderedList', - s: 'unlink', - m: 'WP_Medialib', - z: 'WP_Adv', - t: 'WP_More', - d: 'Strikethrough', - h: 'WP_Help', - p: 'WP_Page', - x: 'WP_Code' - }, function( command, key ) { - editor.shortcuts.add( 'access+' + key, '', command ); - } ); + if ( tinymce.Env.iOS ) { + editor.settings.height = 300; + } - editor.addShortcut( 'meta+s', '', function() { - if ( typeof wp !== 'undefined' && wp.autosave ) { - wp.autosave.server.triggerSave(); + // 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', + l: 'JustifyLeft', + j: 'JustifyFull', + q: 'mceBlockQuote', + u: 'InsertUnorderedList', + o: 'InsertOrderedList', + s: 'unlink', + m: 'WP_Medialib', + z: 'WP_Adv', + t: 'WP_More', + d: 'Strikethrough', + h: 'WP_Help', + p: 'WP_Page', + x: 'WP_Code' + }, function( command, key ) { + editor.shortcuts.add( 'access+' + key, '', command ); + } ); + + editor.addShortcut( 'meta+s', '', function() { + if ( wp && wp.autosave ) { + wp.autosave.server.triggerSave(); + } + } ); } ); - } ); - /** - * Experimental: create a floating toolbar. - * This functionality will change in the next releases. Not recommended for use by plugins. - */ - ( function() { - var Factory = tinymce.ui.Factory, - settings = editor.settings, - currentToolbar, - currentSelection; + /** + * Experimental: create a floating toolbar. + * This functionality will change in the next releases. Not recommended for use by plugins. + */ + ( function() { + var Factory = tinymce.ui.Factory, + settings = editor.settings, + currentToolbar, + currentSelection; - function create( buttons ) { - var toolbar, - toolbarItems = [], - buttonGroup; + function create( buttons ) { + var toolbar, + toolbarItems = [], + buttonGroup; - each( buttons, function( item ) { - var itemName; + each( buttons, function( item ) { + var itemName; - function bindSelectorChanged() { - var selection = editor.selection; + function bindSelectorChanged() { + var selection = editor.selection; - if ( itemName === 'bullist' ) { - selection.selectorChanged( 'ul > li', function( state, args ) { - var i = args.parents.length, - nodeName; + if ( itemName === 'bullist' ) { + selection.selectorChanged( 'ul > li', function( state, args ) { + var i = args.parents.length, + nodeName; - while ( i-- ) { - nodeName = args.parents[ i ].nodeName; + while ( i-- ) { + nodeName = args.parents[ i ].nodeName; - if ( nodeName === 'OL' || nodeName == 'UL' ) { - break; + if ( nodeName === 'OL' || nodeName == 'UL' ) { + break; + } } - } - item.active( state && nodeName === 'UL' ); - } ); - } + item.active( state && nodeName === 'UL' ); + } ); + } - if ( itemName === 'numlist' ) { - selection.selectorChanged( 'ol > li', function( state, args ) { - var i = args.parents.length, - nodeName; + if ( itemName === 'numlist' ) { + selection.selectorChanged( 'ol > li', function( state, args ) { + var i = args.parents.length, + nodeName; - while ( i-- ) { - nodeName = args.parents[ i ].nodeName; + while ( i-- ) { + nodeName = args.parents[ i ].nodeName; - if ( nodeName === 'OL' || nodeName === 'UL' ) { - break; + if ( nodeName === 'OL' || nodeName === 'UL' ) { + break; + } } - } - item.active( state && nodeName === 'OL' ); - } ); - } + item.active( state && nodeName === 'OL' ); + } ); + } - if ( item.settings.stateSelector ) { - selection.selectorChanged( item.settings.stateSelector, function( state ) { - item.active( state ); - }, true ); - } + if ( item.settings.stateSelector ) { + selection.selectorChanged( item.settings.stateSelector, function( state ) { + item.active( state ); + }, true ); + } - if ( item.settings.disabledStateSelector ) { - selection.selectorChanged( item.settings.disabledStateSelector, function( state ) { - item.disabled( state ); - } ); + if ( item.settings.disabledStateSelector ) { + selection.selectorChanged( item.settings.disabledStateSelector, function( state ) { + item.disabled( state ); + } ); + } } - } - if ( item === '|' ) { - buttonGroup = null; - } else { - if ( Factory.has( item ) ) { - item = { - type: item - }; - - if ( settings.toolbar_items_size ) { - item.size = settings.toolbar_items_size; - } - - toolbarItems.push( item ); - + if ( item === '|' ) { buttonGroup = null; } else { - if ( ! buttonGroup ) { - buttonGroup = { - type: 'buttongroup', - items: [] + if ( Factory.has( item ) ) { + item = { + type: item }; - toolbarItems.push( buttonGroup ); - } + if ( settings.toolbar_items_size ) { + item.size = settings.toolbar_items_size; + } - if ( editor.buttons[ item ] ) { - itemName = item; - item = editor.buttons[ itemName ]; + toolbarItems.push( item ); - if ( typeof item === 'function' ) { - item = item(); + buttonGroup = null; + } else { + if ( ! buttonGroup ) { + buttonGroup = { + type: 'buttongroup', + items: [] + }; + + toolbarItems.push( buttonGroup ); } - item.type = item.type || 'button'; + if ( editor.buttons[ item ] ) { + itemName = item; + item = editor.buttons[ itemName ]; - if ( settings.toolbar_items_size ) { - item.size = settings.toolbar_items_size; - } + if ( typeof item === 'function' ) { + item = item(); + } - item = Factory.create( item ); + item.type = item.type || 'button'; - buttonGroup.items.push( item ); + if ( settings.toolbar_items_size ) { + item.size = settings.toolbar_items_size; + } - if ( editor.initialized ) { - bindSelectorChanged(); - } else { - editor.on( 'init', bindSelectorChanged ); + item = Factory.create( item ); + + buttonGroup.items.push( item ); + + if ( editor.initialized ) { + bindSelectorChanged(); + } else { + editor.on( 'init', bindSelectorChanged ); + } } } } - } - } ); + } ); - toolbar = Factory.create( { - type: 'panel', - layout: 'stack', - classes: 'toolbar-grp inline-toolbar-grp', - ariaRoot: true, - ariaRemember: true, - items: [ { - type: 'toolbar', - layout: 'flow', - items: toolbarItems - } ] - } ); + toolbar = Factory.create( { + type: 'panel', + layout: 'stack', + classes: 'toolbar-grp inline-toolbar-grp', + ariaRoot: true, + ariaRemember: true, + items: [ { + type: 'toolbar', + layout: 'flow', + items: toolbarItems + } ] + } ); - function hide() { - toolbar.hide(); - } + function hide() { + toolbar.hide(); + } - function reposition() { - var top, left, minTop, className, - windowPos, adminbar, mceToolbar, boundary, - boundaryMiddle, boundaryVerticalMiddle, spaceTop, - spaceBottom, windowWidth, toolbarWidth, toolbarHalf, - iframe, iframePos, iframeWidth, iframeHeigth, - toolbarNodeHeight, verticalSpaceNeeded, - toolbarNode = this.getEl(), - buffer = 5, - margin = 8, - adminbarHeight = 0; + function reposition() { + var top, left, minTop, className, + windowPos, adminbar, mceToolbar, boundary, + boundaryMiddle, boundaryVerticalMiddle, spaceTop, + spaceBottom, windowWidth, toolbarWidth, toolbarHalf, + iframe, iframePos, iframeWidth, iframeHeigth, + toolbarNodeHeight, verticalSpaceNeeded, + toolbarNode = this.getEl(), + buffer = 5, + margin = 8, + adminbarHeight = 0; - if ( ! currentSelection ) { - return; - } + if ( ! currentSelection ) { + return; + } - windowPos = window.pageYOffset || document.documentElement.scrollTop; - adminbar = tinymce.$( '#wpadminbar' )[0]; - mceToolbar = tinymce.$( '.mce-toolbar-grp', editor.getContainer() )[0]; - boundary = currentSelection.getBoundingClientRect(); - boundaryMiddle = ( boundary.left + boundary.right ) / 2; - boundaryVerticalMiddle = ( boundary.top + boundary.bottom ) / 2; - spaceTop = boundary.top; - spaceBottom = iframeHeigth - boundary.bottom; - windowWidth = window.innerWidth; - toolbarWidth = toolbarNode.offsetWidth; - toolbarHalf = toolbarWidth / 2; - iframe = document.getElementById( editor.id + '_ifr' ); - iframePos = DOM.getPos( iframe ); - iframeWidth = iframe.offsetWidth; - iframeHeigth = iframe.offsetHeight; - toolbarNodeHeight = toolbarNode.offsetHeight; - verticalSpaceNeeded = toolbarNodeHeight + margin + buffer; + windowPos = window.pageYOffset || document.documentElement.scrollTop; + adminbar = tinymce.$( '#wpadminbar' )[0]; + mceToolbar = tinymce.$( '.mce-toolbar-grp', editor.getContainer() )[0]; + boundary = currentSelection.getBoundingClientRect(); + boundaryMiddle = ( boundary.left + boundary.right ) / 2; + boundaryVerticalMiddle = ( boundary.top + boundary.bottom ) / 2; + spaceTop = boundary.top; + spaceBottom = iframeHeigth - boundary.bottom; + windowWidth = window.innerWidth; + toolbarWidth = toolbarNode.offsetWidth; + toolbarHalf = toolbarWidth / 2; + iframe = document.getElementById( editor.id + '_ifr' ); + iframePos = DOM.getPos( iframe ); + iframeWidth = iframe.offsetWidth; + iframeHeigth = iframe.offsetHeight; + toolbarNodeHeight = toolbarNode.offsetHeight; + verticalSpaceNeeded = toolbarNodeHeight + margin + buffer; - if ( spaceTop >= verticalSpaceNeeded ) { - className = ' mce-arrow-down'; - top = boundary.top + iframePos.y - toolbarNodeHeight - margin; - } else if ( spaceBottom >= verticalSpaceNeeded ) { - className = ' mce-arrow-up'; - top = boundary.bottom + iframePos.y; - } else { - top = buffer; - - if ( boundaryVerticalMiddle >= verticalSpaceNeeded ) { + if ( spaceTop >= verticalSpaceNeeded ) { className = ' mce-arrow-down'; + top = boundary.top + iframePos.y - toolbarNodeHeight - margin; + } else if ( spaceBottom >= verticalSpaceNeeded ) { + className = ' mce-arrow-up'; + top = boundary.bottom + iframePos.y; } else { - className = ' mce-arrow-up'; + top = buffer; + + if ( boundaryVerticalMiddle >= verticalSpaceNeeded ) { + className = ' mce-arrow-down'; + } else { + className = ' mce-arrow-up'; + } } - } - // Make sure the image toolbar is below the main toolbar. - if ( mceToolbar ) { - minTop = DOM.getPos( mceToolbar ).y + mceToolbar.clientHeight; - } else { - minTop = iframePos.y; - } + // Make sure the image toolbar is below the main toolbar. + if ( mceToolbar ) { + minTop = DOM.getPos( mceToolbar ).y + mceToolbar.clientHeight; + } else { + minTop = iframePos.y; + } - // Make sure the image toolbar is below the adminbar (if visible) or below the top of the window. - if ( windowPos ) { - if ( adminbar && adminbar.getBoundingClientRect().top === 0 ) { - adminbarHeight = adminbar.clientHeight; + // Make sure the image toolbar is below the adminbar (if visible) or below the top of the window. + if ( windowPos ) { + if ( adminbar && adminbar.getBoundingClientRect().top === 0 ) { + adminbarHeight = adminbar.clientHeight; + } + + if ( windowPos + adminbarHeight > minTop ) { + minTop = windowPos + adminbarHeight; + } } - if ( windowPos + adminbarHeight > minTop ) { - minTop = windowPos + adminbarHeight; + if ( top && minTop && ( minTop + buffer > top ) ) { + top = minTop + buffer; + className = ''; } - } - if ( top && minTop && ( minTop + buffer > top ) ) { - top = minTop + buffer; - className = ''; - } + left = boundaryMiddle - toolbarHalf; + left += iframePos.x; - left = boundaryMiddle - toolbarHalf; - left += iframePos.x; + if ( boundary.left < 0 || boundary.right > iframeWidth ) { + left = iframePos.x + ( iframeWidth - toolbarWidth ) / 2; + } else if ( toolbarWidth >= windowWidth ) { + className += ' mce-arrow-full'; + left = 0; + } else if ( ( left < 0 && boundary.left + toolbarWidth > windowWidth ) || + ( left + toolbarWidth > windowWidth && boundary.right - toolbarWidth < 0 ) ) { - if ( boundary.left < 0 || boundary.right > iframeWidth ) { - left = iframePos.x + ( iframeWidth - toolbarWidth ) / 2; - } else if ( toolbarWidth >= windowWidth ) { - className += ' mce-arrow-full'; - left = 0; - } else if ( ( left < 0 && boundary.left + toolbarWidth > windowWidth ) || - ( left + toolbarWidth > windowWidth && boundary.right - toolbarWidth < 0 ) ) { + left = ( windowWidth - toolbarWidth ) / 2; + } else if ( left < iframePos.x ) { + className += ' mce-arrow-left'; + left = boundary.left + iframePos.x; + } else if ( left + toolbarWidth > iframeWidth + iframePos.x ) { + className += ' mce-arrow-right'; + left = boundary.right - toolbarWidth + iframePos.x; + } - left = ( windowWidth - toolbarWidth ) / 2; - } else if ( left < iframePos.x ) { - className += ' mce-arrow-left'; - left = boundary.left + iframePos.x; - } else if ( left + toolbarWidth > iframeWidth + iframePos.x ) { - className += ' mce-arrow-right'; - left = boundary.right - toolbarWidth + iframePos.x; - } + toolbarNode.className = toolbarNode.className.replace( / ?mce-arrow-[\w]+/g, '' ); + toolbarNode.className += className; - toolbarNode.className = toolbarNode.className.replace( / ?mce-arrow-[\w]+/g, '' ); - toolbarNode.className += className; + DOM.setStyles( toolbarNode, { 'left': left, 'top': top } ); - DOM.setStyles( toolbarNode, { 'left': left, 'top': top } ); + return this; + } - return this; - } + toolbar.on( 'show', function() { + currentToolbar = this; + this.reposition(); + } ); - toolbar.on( 'show', function() { - currentToolbar = this; - this.reposition(); - } ); + toolbar.on( 'hide', function() { + currentToolbar = false; + } ); - toolbar.on( 'hide', function() { - currentToolbar = false; - } ); + toolbar.on( 'keydown', function( event ) { + if ( event.keyCode === 27 ) { + this.hide(); + editor.focus(); + } + } ); - toolbar.on( 'keydown', function( event ) { - if ( event.keyCode === 27 ) { - this.hide(); - editor.focus(); - } - } ); + toolbar.on( 'remove', function() { + DOM.unbind( window, 'resize scroll', hide ); + editor.dom.unbind( editor.getWin(), 'resize scroll', hide ); + editor.off( 'blur hide', hide ); + } ); - toolbar.on( 'remove', function() { - DOM.unbind( window, 'resize scroll', hide ); - editor.dom.unbind( editor.getWin(), 'resize scroll', hide ); - editor.off( 'blur hide', hide ); - } ); + editor.once( 'init', function() { + DOM.bind( window, 'resize scroll', hide ); + editor.dom.bind( editor.getWin(), 'resize scroll', hide ); + editor.on( 'blur hide', hide ); + } ); - editor.once( 'init', function() { - DOM.bind( window, 'resize scroll', hide ); - editor.dom.bind( editor.getWin(), 'resize scroll', hide ); - editor.on( 'blur hide', hide ); - } ); + toolbar.reposition = reposition; + toolbar.hide().renderTo( document.body ); - toolbar.reposition = reposition; - toolbar.hide().renderTo( document.body ); + return toolbar; + } - return toolbar; - } + editor.shortcuts.add( 'alt+119', '', function() { + var node; - editor.shortcuts.add( 'alt+119', '', function() { - var node; + if ( currentToolbar ) { + node = currentToolbar.find( 'toolbar' )[0]; + node && node.focus( true ); + } + } ); - if ( currentToolbar ) { - node = currentToolbar.find( 'toolbar' )[0]; - node && node.focus( true ); - } - } ); + editor.on( 'nodechange', function( event ) { + var collapsed = editor.selection.isCollapsed(); - editor.on( 'nodechange', function( event ) { - var collapsed = editor.selection.isCollapsed(); + var args = { + element: event.element, + parents: event.parents, + collapsed: collapsed + }; - var args = { - element: event.element, - parents: event.parents, - collapsed: collapsed - }; + editor.fire( 'wptoolbar', args ); - editor.fire( 'wptoolbar', args ); + currentSelection = args.selection || args.element; - currentSelection = args.selection || args.element; + currentToolbar && currentToolbar.hide(); + args.toolbar && args.toolbar.show(); + } ); - currentToolbar && currentToolbar.hide(); - args.toolbar && args.toolbar.show(); - } ); + editor.wp = editor.wp || {}; + editor.wp._createToolbar = create; + }()); - editor.wp = editor.wp || {}; - editor.wp._createToolbar = create; - }()); + function noop() {} - function noop() {} + // Expose some functions (back-compat) + return { + _showButtons: noop, + _hideButtons: noop, + _setEmbed: noop, + _getEmbed: noop + }; + }); - // Expose some functions (back-compat) - return { - _showButtons: noop, - _hideButtons: noop, - _setEmbed: noop, - _getEmbed: noop - }; -}); +}( window.tinymce, window.jQuery, window.wp ));