Changeset 38487

Timestamp:

08/31/2016 11:12:55 PM (8 years ago)

Author:

jeremyfelt

Message:

Editor: fix jumpiness on pressing backspace and delete in the Text editor.

Merge of [38426] to the 4.6 branch.

Props azaozz.
Fixes #37690.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-admin/js/editor-expand.js (modified) (2 diffs)
• src/wp-includes/script-loader.php (modified) (1 diff)

branches/4.6/src/wp-admin/js/editor-expand.js

@@ -54 +54 @@
             };
 
+        var shrinkTextarea = window._.throttle( function() {
+            var x = window.scrollX || document.documentElement.scrollLeft;
+            var y = window.scrollY || document.documentElement.scrollTop;
+            var height = parseInt( textEditor.style.height, 10 );
+
+            textEditor.style.height = autoresizeMinHeight + 'px';
+
+            if ( textEditor.scrollHeight > autoresizeMinHeight ) {
+                textEditor.style.height = textEditor.scrollHeight + 'px';
+            }
+
+            if ( typeof x !== 'undefined' ) {
+                window.scrollTo( x, y );
+            }
+
+            if ( textEditor.scrollHeight < height ) {
+                adjust();
+            }
+        }, 300 );
+
+        function textEditorResize() {
+            var length = textEditor.value.length;
+
+            if ( mceEditor && ! mceEditor.isHidden() ) {
+                return;
+            }
+
+            if ( ! mceEditor && initialMode === 'tinymce' ) {
+                return;
+            }
+
+            if ( length < oldTextLength ) {
+                shrinkTextarea();
+            } else if ( parseInt( textEditor.style.height, 10 ) < textEditor.scrollHeight ) {
+                textEditor.style.height = Math.ceil( textEditor.scrollHeight ) + 'px';
+                adjust();
+            }
+
+            oldTextLength = length;
+        }
+
         function getHeights() {
             var windowWidth = $window.width();
@@ -74 +115 @@
                 heights.menuBarHeight = 0;
             }
-        }
-
-        function textEditorResize() {
-            if ( mceEditor && ! mceEditor.isHidden() ) {
-                return;
-            }
-
-            if ( ! mceEditor && initialMode === 'tinymce' ) {
-                return;
-            }
-
-            var length = textEditor.value.length;
-            var height = parseInt( textEditor.style.height, 10 );
-            var top = window.scrollTop;
-
-            if ( length < oldTextLength ) {
-                // textEditor.scrollHeight is not adjusted until the next line.
-                textEditor.style.height = 'auto';
-
-                if ( textEditor.scrollHeight > autoresizeMinHeight ) {
-                    textEditor.style.height = textEditor.scrollHeight + 'px';
-                } else {
-                    textEditor.style.height = autoresizeMinHeight + 'px';
-                }
-
-                // Prevent scroll-jumping in Firefox and IE.
-                window.scrollTop = top;
-
-                if ( textEditor.scrollHeight < height ) {
-                    adjust();
-                }
-            } else if ( height < textEditor.scrollHeight ) {
-                textEditor.style.height = textEditor.scrollHeight + 'px';
-                adjust();
-            }
-
-            oldTextLength = length;
         }
 

branches/4.6/src/wp-includes/script-loader.php

@@ -564 +564 @@
         ) );
 
-        $scripts->add( 'editor-expand', "/wp-admin/js/editor-expand$suffix.js", array( 'jquery' ), false, 1 );
+        $scripts->add( 'editor-expand', "/wp-admin/js/editor-expand$suffix.js", array( 'jquery', 'underscore' ), false, 1 );
 
         $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array( 'wp-lists', 'postbox' ), false, 1 );