sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Editor: improve attaching a callback on editor init.

Browse Source 
See #42029

git-svn-id: https://develop.svn.wordpress.org/trunk@41646 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2017-09-29 19:11:08 +00:00
parent 6b72687e10
commit b076026362
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/wp-admin/js/editor.js
View File

@ -119,31 +119,7 @@ window.wp = window.wp || {};
// Restore the selection // Restore the selection
focusHTMLBookmarkInVisualEditor( editor ); focusHTMLBookmarkInVisualEditor( editor );
} else { } else {
/** tinymce.init( window.tinyMCEPreInit.mceInit[ id ] );
* TinyMCE is still not loaded. In order to restore the selection
* when the editor loads, a `on('init')` event is added, that will
* do the restoration.
*
* To achieve that, the initialization config is cloned and extended
* to include the `setup` method, which makes it possible to add the
* `on('init')` event.
*
* Cloning is used to prevent modification of the original init config,
* which may cause unwanted side effects.
*/
var tinyMCEConfig = $.extend(
{},
window.tinyMCEPreInit.mceInit[ id ],
{
setup: function( editor ) {
editor.on( 'init', function( event ) {
focusHTMLBookmarkInVisualEditor( event.target );
});
}
}
);
tinymce.init( tinyMCEConfig );
} }
wrap.removeClass( 'html-active' ).addClass( 'tmce-active' ); wrap.removeClass( 'html-active' ).addClass( 'tmce-active' );
@ -726,8 +702,7 @@ window.wp = window.wp || {};
editor.$( startNode ).before( startElement[0] ); editor.$( startNode ).before( startElement[0] );
editor.$( startNode ).after( endElement[0] ); editor.$( startNode ).after( endElement[0] );
} } else {
else {
boundaryRange.collapse( false ); boundaryRange.collapse( false );
boundaryRange.insertNode( endElement[0] ); boundaryRange.insertNode( endElement[0] );
@ -838,6 +813,13 @@ window.wp = window.wp || {};
textArea.setSelectionRange( start, end ); textArea.setSelectionRange( start, end );
} }
// Restore the selection when the editor is initialized. Needed when the Text editor is the default.
$( document ).on( 'tinymce-editor-init.keep-scroll-position', function( event, editor ) {
if ( editor.$( '.mce_SELRES_start' ).length ) {
focusHTMLBookmarkInVisualEditor( editor );
}
} );
/** /**
* @summary Replaces <p> tags with two line breaks. "Opposite" of wpautop(). * @summary Replaces <p> tags with two line breaks. "Opposite" of wpautop().
* *