Changeset 29628

Timestamp:

08/26/2014 06:38:26 PM (10 years ago)

Author:

helen

Message:

Editor scrolling: reduce the amount of height jumping on load.

props avryl.
fixes #29307.

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/js/editor-expand.js (modified) (2 diffs)
• wp-includes/class-wp-editor.php (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpautoresize/plugin.js (modified) (1 diff)

trunk/src/wp-admin/edit-form-advanced.php

@@ -497 +497 @@
     'drag_drop_upload' => true,
     'tabfocus_elements' => 'insert-media-button-1,save-post',
-    'editor_height' => 360,
+    'editor_height' => 300,
     'tinymce' => array(
         'resize' => false,

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

@@ -35 +35 @@
         pinnedToolsTop = 56,
         autoresizeMinHeight = 300,
+        initialMode = window.getUserSetting( 'editor' ),
         // These are corrected when adjust() runs, except on scrolling if already set.
         heights = {
@@ -120 +121 @@
 
     function textEditorResize() {
-        if ( mceEditor && ! mceEditor.isHidden() ) {
+        if ( ( mceEditor && ! mceEditor.isHidden() ) || ( ! mceEditor && initialMode === 'tinymce' ) ) {
             return;
         }

trunk/src/wp-includes/class-wp-editor.php

@@ -113 +113 @@
             return $set;
 
-        if ( 'content' === $editor_id ) {
+        if ( 'content' === $editor_id && empty( $set['tinymce']['wp_autoresize_on'] ) ) {
             // A cookie (set when a user resizes the editor) overrides the height.
             $cookie = (int) get_user_setting( 'ed_size' );

trunk/src/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js

@@ -23 +23 @@
 tinymce.PluginManager.add( 'wpautoresize', function( editor ) {
     var settings = editor.settings,
-        oldSize = 0,
+        oldSize = 300,
         isActive = false;