Changeset 42183 for trunk

Timestamp:

11/15/2017 12:20:21 AM (7 years ago)

Author:

westonruter

Message:

Editor: Improve scrolling behavior and prevent autosave logic from causing dirty state when just switching between Visual and Text tabs.

Props pento.
See #41962, #42029.
Fixes #42530 for trunk.

File:

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

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

@@ -271 +271 @@
                 for ( var i = 0; i < shortcodes.length; i++ ) {
                     var shortcode = shortcodes[ i ].replace( /^\[+/g, '' );
-    
+
                     if ( result.indexOf( shortcode ) === -1 ) {
                         result.push( shortcode );
@@ -582 +582 @@
             removeSelectionMarker( startNode );
             removeSelectionMarker( endNode );
+
+            editor.save();
         }
 
@@ -624 +626 @@
                 edTools = $( '#wp-content-editor-tools' ),
                 edToolsHeight = 0,
-                edToolsOffsetTop = 0;
+                edToolsOffsetTop = 0,
+
+                $scrollArea;
 
             if ( edTools.length ) {
@@ -649 +653 @@
              * the top of the viewport (under the Master Bar)
              */
-            var adjustedScroll = Math.max( selectionPosition - visibleAreaHeight / 2, edToolsOffsetTop - edToolsHeight );
-
-            $( 'html,body' ).animate( {
+            var adjustedScroll;
+            if ( editor.settings.wp_autoresize_on ) {
+                $scrollArea = $( 'html,body' );
+                adjustedScroll = Math.max( selectionPosition - visibleAreaHeight / 2, edToolsOffsetTop - edToolsHeight );
+            } else {
+                $scrollArea = $( editor.contentDocument ).find( 'html,body' );
+                adjustedScroll = elementTop;
+            }
+
+            $scrollArea.animate( {
                 scrollTop: parseInt( adjustedScroll, 10 )
             }, 100 );