Changeset 29075

Timestamp:

07/10/2014 07:35:32 PM (11 years ago)

Author:

helen

Message:

Editor scrolling:

• Make sure the background color for tools is only applied to the main editor.
• Fix toolbar width for smaller screens.
• Ensure toolbar doesn't end up in a weird place when scrolling down too fast.
• Avoid JS errors for post types that don't support the editor.

props avryl. see #28328.

Location:

trunk/src

Files:

• wp-admin/css/common.css (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/js/editor-expand.js (modified) (3 diffs)
• wp-includes/css/editor.css (modified) (1 diff)

trunk/src/wp-admin/css/common.css

@@ -2643 +2643 @@
     }
 
-    #wpwrap {
-        background: #f0f0f0;
-    }
-
     #wpcontent {
         position: relative;

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

@@ -12 +12 @@
 
 wp_enqueue_script('post');
-wp_enqueue_script('editor-expand');
+
+if ( post_type_supports( $post_type, 'editor' ) ) {
+    wp_enqueue_script('editor-expand');
+}
 
 if ( wp_is_mobile() )

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

@@ -286 +286 @@
                 position: 'fixed',
                 top: adminBarHeight + toolsHeight,
-                width: editorWidth - ( visual ? 0 : 38 ),
+                width: $editor.parent().width() - ( $top.outerWidth() - $top.width() ),
                 borderTop: '1px solid #e5e5e5'
             } );
@@ -311 +311 @@
                     position: 'absolute',
                     top: 0,
-                    borderTop: 'none',
                     width: $contentWrap.width()
                 } );
@@ -320 +319 @@
                 $top.css( {
                     position: 'absolute',
-                    top: window.pageYOffset - $editor.offset().top + adminBarHeight + $tools.outerHeight(),
-                    borderTop: 'none'
+                    top: editorHeight - buffer
                 } );
 
                 $tools.css( {
                     position: 'absolute',
-                    top: window.pageYOffset - $contentWrap.offset().top + adminBarHeight,
-                    borderTop: 'none',
+                    top: editorHeight - buffer + 1, // border
                     width: $contentWrap.width()
                 } );

trunk/src/wp-includes/css/editor.css

@@ -757 +757 @@
 }
 
-.wp-editor-tools {
+#wp-content-editor-tools {
     background-color: #f1f1f1;
     padding-top: 20px;