Changeset 26516

Timestamp:

12/02/2013 03:18:40 AM (11 years ago)

Author:

azaozz

Message:

Make the responsive menu usable with a mouse, fix non-folded and :focus styles, toggle the submenus on touchend/click. Fixes #26086.

Location:

trunk/src/wp-admin

Files:

• css/wp-admin.css (modified) (1 diff)
• js/common.js (modified) (5 diffs)

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

@@ -11824 +11824 @@
     }
 
+    .auto-fold #adminmenu a.menu-top:focus + .wp-submenu,
+    .auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu {
+        position: relative;
+        left: -1px;
+        right: 0;
+        top: 0;
+    }
+
     /* Remove submenu headers and adjust sub meu*/
     #adminmenu .wp-submenu .wp-submenu-head {

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

@@ -252 +252 @@
                 return;
 
+            if ( menu.data('wp-responsive') ) {
+                // The menu is in responsive mode, bail
+                return;
+            }
+
             menutop = $(this).offset().top;
             wintop = $(window).scrollTop();
@@ -276 +281 @@
         },
         out: function(){
+            if ( menu.data('wp-responsive') ) {
+                // The menu is in responsive mode, bail
+                return;
+            }
+
             $(this).removeClass('opensub').find('.wp-submenu').css('margin-top', '');
         },
@@ -284 +294 @@
 
     menu.on('focus.adminmenu', '.wp-submenu a', function(e){
+        if ( menu.data('wp-responsive') ) {
+            // The menu is in responsive mode, bail
+            return;
+        }
+
         $(e.target).closest('li.menu-top').addClass('opensub');
     }).on('blur.adminmenu', '.wp-submenu a', function(e){
+        if ( menu.data('wp-responsive') ) {
+            // The menu is in responsive mode, bail
+            return;
+        }
+
         $(e.target).closest('li.menu-top').removeClass('opensub');
     });
@@ -542 +562 @@
             $adminmenu.on( 'touchstart.wp-responsive', 'li.wp-has-submenu > a', function() {
                 scrollStart = $window.scrollTop();
-            }).on( 'touchend.wp-responsive', 'li.wp-has-submenu > a', function( event ) {
-                if ( ! $adminmenu.data('wp-responsive') || $window.scrollTop() !== scrollStart ) {
+            }).on( 'touchend.wp-responsive click.wp-responsive', 'li.wp-has-submenu > a', function( event ) {
+                if ( ! $adminmenu.data('wp-responsive') || 
+                    ( event.type === 'touchend' && $window.scrollTop() !== scrollStart ) ) {
+
                     return;
                 }
 
-                $( this ).find( 'li.wp-has-submenu' ).removeClass( 'selected' );
-                $( this ).parent( 'li' ).addClass( 'selected' );
+                $( this ).parent( 'li' ).toggleClass( 'selected' );
                 event.preventDefault();
             });
@@ -554 +575 @@
             self.trigger();
             $document.on( 'wp-window-resized.wp-responsive', $.proxy( this.trigger, this ) );
+
+            // This needs to run later as UI Sortable may be initialized later on $(document).ready()
+            $window.on( 'load.wp-responsive', function() {
+                var width = navigator.userAgent.indexOf('AppleWebKit/') > -1 ? $window.width() : window.innerWidth;
+
+                if ( width <= 782 ) {
+                    self.disableSortables();
+                }
+            });
         },