Changeset 41646

Timestamp:

09/29/2017 07:11:08 PM (8 years ago)

Author:

azaozz

Message:

Editor: improve attaching a callback on editor init.

See #42029

File:

• trunk/src/wp-admin/js/editor.js (modified) (3 diffs)

trunk/src/wp-admin/js/editor.js

@@ -120 +120 @@
                     focusHTMLBookmarkInVisualEditor( editor );
                 } else {
-                    /**
-                     * 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 );
+                    tinymce.init( window.tinyMCEPreInit.mceInit[ id ] );
                 }
 
@@ -727 +703 @@
                 editor.$( startNode ).before( startElement[0] );
                 editor.$( startNode ).after( endElement[0] );
-            }
-            else {
+            } else {
                 boundaryRange.collapse( false );
                 boundaryRange.insertNode( endElement[0] );
@@ -838 +813 @@
             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 );
+            }
+        } );
 
         /**