Changeset 30852 for trunk

Timestamp:

12/15/2014 12:10:18 AM (11 years ago)

Author:

azaozz

Message:

Improve the fix for menu shakiness when over-scrolling. Recalculate heights on editor auto-resize.
See #30692.

File:

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

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

@@ -194 +194 @@
         pinnedMenuTop = false,
         pinnedMenuBottom = false,
-        isScrolling = false,
-        scrollTimer,
         menuTop = 0,
+        menuIsPinned = false,
         height = {
-            document: $document.height(),
             window: $window.height(),
             wpwrap: $wpwrap.height(),
@@ -545 +543 @@
     })();
 
-    function pinMenu() {
-        var windowPos = $window.scrollTop();
+    function pinMenu( event ) {
+        var windowPos = $window.scrollTop(),
+            resizing = ! event || event.type !== 'scroll';
 
         if ( isIOS || isIE8 || $adminmenu.data( 'wp-responsive' ) ) {
@@ -552 +551 @@
         }
 
-        if ( height.menu + height.adminbar + 20 > height.wpwrap ) { // 20px "buffer"
+        if ( height.menu + height.adminbar < height.window ||
+            height.menu + height.adminbar + 20 > height.wpwrap ) {
             unpinMenu();
             return;
         }
+
+        menuIsPinned = true;
 
         if ( height.menu + height.adminbar > height.window ) {
@@ -572 +574 @@
 
                 return;
-            } else if ( windowPos + height.window > height.document - 1 ) {
+            } else if ( windowPos + height.window > $document.height() - 1 ) {
                 if ( ! pinnedMenuBottom ) {
                     pinnedMenuBottom = true;
@@ -639 +641 @@
                     });
                 }
-            } else {
+            } else if ( resizing ) {
                 // Resizing
                 pinnedMenuTop = pinnedMenuBottom = false;
@@ -661 +663 @@
     function resetHeights() {
         height = {
-            document: $document.height(),
             window: $window.height(),
             wpwrap: $wpwrap.height(),
@@ -670 +671 @@
 
     function unpinMenu() {
-        if ( isIOS ) {
+        if ( isIOS || ! menuIsPinned ) {
             return;
         }
 
-        pinnedMenuTop = pinnedMenuBottom = false;
+        pinnedMenuTop = pinnedMenuBottom = menuIsPinned = false;
         $adminMenuWrap.css({
             position: '',
@@ -697 +698 @@
     }
 
-    function scrollStart() {
-        if ( isScrolling ) {
-            window.clearTimeout( scrollTimer );
-
-            scrollTimer = window.setTimeout( function() {
-                isScrolling = false;
-            }, 200 );
-        } else {
-            isScrolling = true;
-            $document.triggerHandler( 'wp-scroll-start' );
-        }
-    }
-
     if ( ! isIOS ) {
-        $window.on( 'scroll.pin-menu', function() {
-            scrollStart();
-            pinMenu();
+        $window.on( 'scroll.pin-menu', pinMenu );
+        $document.on( 'tinymce-editor-init.pin-menu', function( event, editor ) {
+            editor.on( 'wp-autoresize', resetHeights );
         });
     }