Changeset 41630

Timestamp:

09/28/2017 06:44:09 AM (7 years ago)

Author:

pento

Message:

Post Editor: Keep text selection between Visual and Text modes

When switching between post editor modes, the current cursor position and selection is now preserved. This allows authors to switch modes without losing the context of where they were in the document.

Props biskobe.
Fixes #41962.

File:

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

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

@@ -100 +100 @@
                 editorHeight = parseInt( textarea.style.height, 10 ) || 0;
 
+
+
+
                 if ( editor ) {
                     editor.show();
@@ -113 +116 @@
                         }
                     }
+
+
+
                 } 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 );
                 }
 
@@ -127 +157 @@
                 }
 
+
                 if ( editor ) {
                     // Don't resize the textarea in iOS. The iframe is forced to 100% height there, we shouldn't match it.
@@ -144 +175 @@
                     }
 
+
+
                     editor.hide();
+
+
+
+
                 } else {
                     // There is probably a JS error on the page. The TinyMCE editor instance doesn't exist. Show the textarea.
@@ -154 +191 @@
                 window.setUserSetting( 'editor', 'html' );
             }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         }