Changeset 29656

Timestamp:

09/01/2014 06:48:07 PM (10 years ago)

Author:

azaozz

Message:

Editor expand:

• Adjust calculation when comparing sidebar position to wpfooter top. Fixes an annoying jumping when the user scrolls off the bottom.
• Use a var for the 'bottom' distance of the sidebar.
• Fix sidebar pinning when it's height is nearly the same as the viewport height.

Fixes #29349

File:

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

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

@@ -34 +34 @@
         pageYOffsetAtTop = 130,
         pinnedToolsTop = 56,
+        sidebarBottom = 20,
         autoresizeMinHeight = 300,
         initialMode = window.getUserSetting( 'editor' ),
@@ -433 +434 @@
             heights.windowHeight < editorHeight ) { // the editor is taller than the viewport
 
-            if ( heights.sideSortablesHeight > heights.windowHeight || fixedSideTop || fixedSideBottom ) {
+            if ( ( heights.sideSortablesHeight + pinnedToolsTop + sidebarBottom ) > heights.windowHeight || fixedSideTop || fixedSideBottom ) {
                 // Reset when scrolling to the top
                 if ( windowPos + pinnedToolsTop <= postBodyTop ) {
@@ -448 +449 @@
 
                             // don't get over the footer
-                            if ( footerTop < sidebarTop + heights.sideSortablesHeight + 20 ) {
-                                sidebarTop = footerTop - heights.sideSortablesHeight - 20;
+                            if ( footerTop < sidebarTop + heights.sideSortablesHeight + sidebarBottom ) {
+                                sidebarTop = footerTop - heights.sideSortablesHeight - 12;
                             }
 
@@ -457 +458 @@
                                 bottom: ''
                             });
-                        } else if ( ! fixedSideBottom && heights.sideSortablesHeight + $sideSortables.offset().top + 20 < windowPos + heights.windowHeight ) {
+                        } else if ( ! fixedSideBottom && heights.sideSortablesHeight + $sideSortables.offset().top + sidebarBottom < windowPos + heights.windowHeight ) {
                             // pin the bottom
                             fixedSideBottom = true;
@@ -464 +465 @@
                                 position: 'fixed',
                                 top: 'auto',
-                                bottom: '20px'
+                                bottom: sidebarBottom
                             });
                         }
@@ -472 +473 @@
                             // let it scroll
                             fixedSideBottom = false;
-                            sidebarTop = $sideSortables.offset().top - 20;
+                            sidebarTop = $sideSortables.offset().top - sidebarBottom;
                             footerTop = $footer.offset().top;
 
                             // don't get over the footer
-                            if ( footerTop < sidebarTop + heights.sideSortablesHeight + 20 ) {
-                                sidebarTop = footerTop - heights.sideSortablesHeight - 20;
+                            if ( footerTop < sidebarTop + heights.sideSortablesHeight + sidebarBottom ) {
+                                sidebarTop = footerTop - heights.sideSortablesHeight - 12;
                             }
 
@@ -500 +501 @@
                 // if the sidebar container is smaller than the viewport, then pin/unpin the top when scrolling
                 if ( windowPos >= ( postBodyTop - pinnedToolsTop ) ) {
+
                     $sideSortables.css( {
                         position: 'fixed',
@@ -570 +572 @@
         $document.on( 'wp-collapse-menu.editor-expand postboxes-columnchange.editor-expand editor-classchange.editor-expand', adjust )
             .on( 'postbox-toggled.editor-expand', function() {
-                if ( ! fixedSideTop && ! fixedSideBottom && window.pageYOffset > 20 ) {
+                if ( ! fixedSideTop && ! fixedSideBottom && window.pageYOffset > pinnedToolsTop ) {
                     fixedSideBottom = true;
                     window.scrollBy( 0, -1 );