Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-26 22:32:52 +02:00
Code Issues Projects Releases Wiki Activity

Admin menu: Revert [31720] for swipe open/closed.

Browse Source 
This is problematic on any device that uses swipe for history navigation, particularly iOS. It's also quite unrefined from an interaction point of view and would not be material for this release either way.

see #31187.

Built from https://develop.svn.wordpress.org/trunk@31910


git-svn-id: http://core.svn.wordpress.org/trunk@31889 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2015-03-27 17:48:30 +00:00
parent bfb9990548
commit 007665e7be
3 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
wp-admin/js/common.js
View File

@ -705,8 +705,7 @@ $(document).ready( function() {
window.wpResponsive = {
init: function() {
var self = this,
x, y;
var self = this;
// Modify functionality based on custom activate/deactivate event
$document.on( 'wp-responsive-activate.wp-responsive', function() {
@ -721,7 +720,7 @@ $(document).ready( function() {
$( '#wp-admin-bar-menu-toggle' ).on( 'click.wp-responsive', function( event ) {
event.preventDefault();
$wpwrap.toggleClass( 'wp-responsive-open' );
if ( self.isOpen() ) {
if ( $wpwrap.hasClass( 'wp-responsive-open' ) ) {
$(this).find('a').attr( 'aria-expanded', 'true' );
$( '#adminmenu a:first' ).focus();
} else {
@ -729,37 +728,6 @@ $(document).ready( function() {
}
} );
$window.on( 'touchstart.wp-responsive', function( event ) {
var touches = event.originalEvent.touches;
if ( 1 !== touches.length ) {
return;
}
x = touches[0].clientX;
y = touches[0].clientY;
} );
$window.on( 'touchend.wp-responsive', function( event ) {
var touches = event.originalEvent.changedTouches,
isOpen = self.isOpen(),
distanceX;
if ( 1 === touches.length && x && y ) {
if ( ( window.isRtl && isOpen ) || ( ! window.isRtl && ! isOpen ) ) {
distanceX = touches[0].clientX - x;
} else {
distanceX = x - touches[0].clientX;
}
if ( distanceX > 30 && distanceX > Math.abs( touches[0].clientY - y ) ) {
$( '#wp-admin-bar-menu-toggle' ).trigger( 'click' );
}
}
x = y = 0;
} );
// Add menu events
$adminmenu.on( 'click.wp-responsive', 'li.wp-has-submenu > a', function( event ) {
if ( ! $adminmenu.data('wp-responsive') ) {
@ -783,10 +751,6 @@ $(document).ready( function() {
});
},
isOpen: function() {
return $wpwrap.hasClass( 'wp-responsive-open' );
},
activate: function() {
setPinMenu();

2
wp-admin/js/common.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta3-31909';
$wp_version = '4.2-beta3-31910';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.