Ticket #29349: 29349.patch

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

@@ -33 +33 @@
                 lastScrollPosition = 0,
                 pageYOffsetAtTop = 130,
                 pinnedToolsTop = 56,
+                sidebarBottom = 20,
                 autoresizeMinHeight = 300,
                 initialMode = window.getUserSetting( 'editor' ),
                 // These are corrected when adjust() runs, except on scrolling if already set.
@@ -432 +433 @@
                         $document.height() > ( $sideSortables.height() + postBodyTop + 120 ) && // the sidebar is not the tallest element
                         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 ) {
                                         $sideSortables.attr( 'style', '' );
@@ -447 +448 @@
                                                         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;
                                                         }
 
                                                         $sideSortables.css({
@@ -456 +457 @@
                                                                 top: sidebarTop,
                                                                 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;
 
@@ -463 +464 @@
                                                         $sideSortables.css({
                                                                 position: 'fixed',
                                                                 top: 'auto',
-                                                                bottom: '20px'
+                                                                bottom: sidebarBottom
                                                         });
                                                 }
                                         } else if ( windowPos < lastScrollPosition ) {
@@ -471 +472 @@
                                                 if ( fixedSideBottom ) {
                                                         // 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;
                                                         }
 
                                                         $sideSortables.css({
@@ -499 +500 @@
                         } else {
                                 // if the sidebar container is smaller than the viewport, then pin/unpin the top when scrolling
                                 if ( windowPos >= ( postBodyTop - pinnedToolsTop ) ) {
+
                                         $sideSortables.css( {
                                                 position: 'fixed',
                                                 top: pinnedToolsTop
@@ -569 +571 @@
                 // Adjust when collapsing the menu, changing the columns, changing the body class.
                 $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 );
                                         adjust();