Ticket #32197: 32197.2.patch

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

@@ -15 +15 @@
                         $visualEditor = $(),
                         $textTop = $( '#ed_toolbar' ),
                         $textEditor = $( '#content' ),
-                        $textEditorClone = $( '<div id="content-textarea-clone"></div>' ),
                         $bottom = $( '#post-status-info' ),
                         $menuBar = $(),
                         $statusBar = $(),
@@ -52 +51 @@
                                 sideSortablesHeight: 0
                         };
 
-                $textEditorClone.insertAfter( $textEditor );
-
-                $textEditorClone.css( {
-                        'font-family': $textEditor.css( 'font-family' ),
-                        'font-size': $textEditor.css( 'font-size' ),
-                        'line-height': $textEditor.css( 'line-height' ),
-                        'white-space': 'pre-wrap',
-                        'word-wrap': 'break-word'
-                } );
-
                 function getHeights() {
                         var windowWidth = $window.width();
 
@@ -85 +74 @@
                 }
 
                 function textEditorKeyup( event ) {
+                        return;
+
                         var VK = jQuery.ui.keyCode,
                                 key = event.keyCode,
                                 range = document.createRange(),
@@ -123 +114 @@
                 }
 
                 function textEditorResize() {
+                        var pageYOffset, textEditor, height;
+
                         if ( ( mceEditor && ! mceEditor.isHidden() ) || ( ! mceEditor && initialMode === 'tinymce' ) ) {
                                 return;
                         }
 
-                        var textEditorHeight = $textEditor.height(),
-                                hiddenHeight;
+                        pageYOffset = window.pageYOffset
 
-                        $textEditorClone.width( $textEditor.width() - 22 );
-                        $textEditorClone.text( $textEditor.val() + '&nbsp;' );
+                        textEditor = $textEditor[0];
+                        height = textEditor.style.height;
 
-                        hiddenHeight = $textEditorClone.height();
+                        textEditor.style.height = 'auto';
+                        textEditor.style.height = textEditor.scrollHeight + 'px';
 
-                        if ( hiddenHeight < autoresizeMinHeight ) {
-                                hiddenHeight = autoresizeMinHeight;
-                        }
+                        window.scrollTo( window.pageXOffset, pageYOffset );
 
-                        if ( hiddenHeight === textEditorHeight ) {
-                                return;
+                        if ( height !== textEditor.style.height ) {
+                                adjust();
                         }
-
-                        $textEditor.height( hiddenHeight );
-
-                        adjust();
                 }
 
                 // We need to wait for TinyMCE to initialize.
@@ -603 +590 @@
                                         $textEditor.css( {
                                                 marginTop: heights.textTopHeight
                                         } );
-
-                                        $textEditorClone.width( contentWrapWidth - 20 - ( borderWidth * 2 ) );
                                 }
                         }
                 }