enmi-conf.org: comparison wp/wp-includes/js/jquery/ui/menu.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-includes/js/jquery/ui/menu.js

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 /*!
-* jQuery UI Menu 1.12.1
+* jQuery UI Menu 1.13.1
 * http://jqueryui.com
 *
 * Copyright jQuery Foundation and other contributors
 * Released under the MIT license.
 * http://jquery.org/license
 //>>css.structure: ../../themes/base/core.css
 //>>css.structure: ../../themes/base/menu.css
 //>>css.theme: ../../themes/base/theme.css
 ( function( factory ) {
+	"use strict";
 	if ( typeof define === "function" && define.amd ) {
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
 	} else {
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 return $.widget( "ui.menu", {
-	version: "1.12.1",
+	version: "1.13.1",
 	defaultElement: "<ul>",
 	delay: 300,
 	options: {
 		icons: {
 			submenu: "ui-icon-caret-1-e"
 		this.activeMenu = this.element;
 		// Flag used to prevent firing of the click handler
 		// as the event bubbles up through nested menus
 		this.mouseHandled = false;
+		this.lastMousePosition = { x: null, y: null };
 		this.element
 			.uniqueId()
 			.attr( {
 				role: this.options.role,
 				tabIndex: 0
 			// Prevent focus from sticking to links inside menu after clicking
 			// them (focus should always stay on UL during navigation).
 			"mousedown .ui-menu-item": function( event ) {
 				event.preventDefault();
+				this._activateItem( event );
 			},
 			"click .ui-menu-item": function( event ) {
 				var target = $( event.target );
 				var active = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
 				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
 					// Open submenu on click
 					if ( target.has( ".ui-menu" ).length ) {
 						this.expand( event );
 					} else if ( !this.element.is( ":focus" ) &&
-							active.closest( ".ui-menu" ).length ) {
+						active.closest( ".ui-menu" ).length ) {
 						// Redirect focus to the menu
 						this.element.trigger( "focus", [ true ] );
 						// If the active item is on the top level, let it stay active.
 							clearTimeout( this.timer );
 						}
 					}
 				}
 			},
-			"mouseenter .ui-menu-item": function( event ) {
+			"mouseenter .ui-menu-item": "_activateItem",
+			"mousemove .ui-menu-item": "_activateItem",
-				// Ignore mouse events while typeahead is active, see #10458.
-				// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
-				// is over an item in the menu
-				if ( this.previousFilter ) {
-					return;
-				}
-				var actualTarget = $( event.target ).closest( ".ui-menu-item" ),
-					target = $( event.currentTarget );
-				// Ignore bubbled events on parent items, see #11641
-				if ( actualTarget[ 0 ] !== target[ 0 ] ) {
-					return;
-				}
-				// Remove ui-state-active class from siblings of the newly focused menu item
-				// to avoid a jump caused by adjacent elements both having a class with a border
-				this._removeClass( target.siblings().children( ".ui-state-active" ),
-					null, "ui-state-active" );
-				this.focus( event, target );
-			},
 			mouseleave: "collapseAll",
 			"mouseleave .ui-menu": "collapseAll",
 			focus: function( event, keepActiveItem ) {
 				// If there's already an active item, keep it active
 				// If not, activate the first item
-				var item = this.active || this.element.find( this.options.items ).eq( 0 );
+				var item = this.active || this._menuItems().first();
 				if ( !keepActiveItem ) {
 					this.focus( event, item );
 				}
 			},
 		// Clicks outside of a menu collapse any open menus
 		this._on( this.document, {
 			click: function( event ) {
 				if ( this._closeOnDocumentClick( event ) ) {
-					this.collapseAll( event );
+					this.collapseAll( event, true );
 				}
 				// Reset the mouseHandled flag
 				this.mouseHandled = false;
 			}
 		} );
+	},
+	_activateItem: function( event ) {
+		// Ignore mouse events while typeahead is active, see #10458.
+		// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
+		// is over an item in the menu
+		if ( this.previousFilter ) {
+			return;
+		}
+		// If the mouse didn't actually move, but the page was scrolled, ignore the event (#9356)
+		if ( event.clientX === this.lastMousePosition.x &&
+			event.clientY === this.lastMousePosition.y ) {
+			return;
+		}
+		this.lastMousePosition = {
+			x: event.clientX,
+			y: event.clientY
+		};
+		var actualTarget = $( event.target ).closest( ".ui-menu-item" ),
+			target = $( event.currentTarget );
+		// Ignore bubbled events on parent items, see #11641
+		if ( actualTarget[ 0 ] !== target[ 0 ] ) {
+			return;
+		}
+		// If the item is already active, there's nothing to do
+		if ( target.is( ".ui-state-active" ) ) {
+			return;
+		}
+		// Remove ui-state-active class from siblings of the newly focused menu item
+		// to avoid a jump caused by adjacent elements both having a class with a border
+		this._removeClass( target.siblings().children( ".ui-state-active" ),
+			null, "ui-state-active" );
+		this.focus( event, target );
 	},
 	_destroy: function() {
 		var items = this.element.find( ".ui-menu-item" )
 				.removeAttr( "role aria-disabled" ),
 		// Destroy (sub)menus
 		this.element
 			.removeAttr( "aria-activedescendant" )
 			.find( ".ui-menu" ).addBack()
-				.removeAttr( "role aria-labelledby aria-expanded aria-hidden aria-disabled " +
+			.removeAttr( "role aria-labelledby aria-expanded aria-hidden aria-disabled " +
-					"tabIndex" )
+				"tabIndex" )
-				.removeUniqueId()
+			.removeUniqueId()
-				.show();
+			.show();
 		submenus.children().each( function() {
 			var elem = $( this );
 			if ( elem.data( "ui-menu-submenu-caret" ) ) {
 				elem.remove();
 	_keydown: function( event ) {
 		var match, prev, character, skip,
 			preventDefault = true;
 		switch ( event.keyCode ) {
-		case $.ui.keyCode.PAGE_UP:
+			case $.ui.keyCode.PAGE_UP:
-			this.previousPage( event );
+				this.previousPage( event );
-			break;
+				break;
-		case $.ui.keyCode.PAGE_DOWN:
+			case $.ui.keyCode.PAGE_DOWN:
-			this.nextPage( event );
+				this.nextPage( event );
-			break;
+				break;
-		case $.ui.keyCode.HOME:
+			case $.ui.keyCode.HOME:
-			this._move( "first", "first", event );
+				this._move( "first", "first", event );
-			break;
+				break;
-		case $.ui.keyCode.END:
+			case $.ui.keyCode.END:
-			this._move( "last", "last", event );
+				this._move( "last", "last", event );
-			break;
+				break;
-		case $.ui.keyCode.UP:
+			case $.ui.keyCode.UP:
-			this.previous( event );
+				this.previous( event );
-			break;
+				break;
-		case $.ui.keyCode.DOWN:
+			case $.ui.keyCode.DOWN:
-			this.next( event );
+				this.next( event );
-			break;
+				break;
-		case $.ui.keyCode.LEFT:
+			case $.ui.keyCode.LEFT:
-			this.collapse( event );
+				this.collapse( event );
-			break;
+				break;
-		case $.ui.keyCode.RIGHT:
+			case $.ui.keyCode.RIGHT:
-			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
+				if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
-				this.expand( event );
+					this.expand( event );
-			}
+				}
-			break;
+				break;
-		case $.ui.keyCode.ENTER:
+			case $.ui.keyCode.ENTER:
-		case $.ui.keyCode.SPACE:
+			case $.ui.keyCode.SPACE:
-			this._activate( event );
+				this._activate( event );
-			break;
+				break;
-		case $.ui.keyCode.ESCAPE:
+			case $.ui.keyCode.ESCAPE:
-			this.collapse( event );
+				this.collapse( event );
-			break;
+				break;
-		default:
+			default:
-			preventDefault = false;
+				preventDefault = false;
-			prev = this.previousFilter || "";
+				prev = this.previousFilter || "";
-			skip = false;
+				skip = false;
-			// Support number pad values
+				// Support number pad values
-			character = event.keyCode >= 96 && event.keyCode <= 105 ?
+				character = event.keyCode >= 96 && event.keyCode <= 105 ?
-				( event.keyCode - 96 ).toString() : String.fromCharCode( event.keyCode );
+					( event.keyCode - 96 ).toString() : String.fromCharCode( event.keyCode );
-			clearTimeout( this.filterTimer );
+				clearTimeout( this.filterTimer );
-			if ( character === prev ) {
+				if ( character === prev ) {
-				skip = true;
+					skip = true;
-			} else {
+				} else {
-				character = prev + character;
+					character = prev + character;
-			}
+				}
-			match = this._filterMenuItems( character );
-			match = skip && match.index( this.active.next() ) !== -1 ?
-				this.active.nextAll( ".ui-menu-item" ) :
-				match;
-			// If no matches on the current filter, reset to the last character pressed
-			// to move down the menu to the first item that starts with that character
-			if ( !match.length ) {
-				character = String.fromCharCode( event.keyCode );
 				match = this._filterMenuItems( character );
-			}
+				match = skip && match.index( this.active.next() ) !== -1 ?
+					this.active.nextAll( ".ui-menu-item" ) :
-			if ( match.length ) {
+					match;
-				this.focus( event, match );
-				this.previousFilter = character;
+				// If no matches on the current filter, reset to the last character pressed
-				this.filterTimer = this._delay( function() {
+				// to move down the menu to the first item that starts with that character
+				if ( !match.length ) {
+					character = String.fromCharCode( event.keyCode );
+					match = this._filterMenuItems( character );
+				}
+				if ( match.length ) {
+					this.focus( event, match );
+					this.previousFilter = character;
+					this.filterTimer = this._delay( function() {
+						delete this.previousFilter;
+					}, 1000 );
+				} else {
 					delete this.previousFilter;
-				}, 1000 );
+				}
-			} else {
-				delete this.previousFilter;
-			}
 		}
 		if ( preventDefault ) {
 			event.preventDefault();
 		}
 		// Don't refresh list items that are already adapted
 		newItems = items.not( ".ui-menu-item, .ui-menu-divider" );
 		newWrappers = newItems.children()
 			.not( ".ui-menu" )
-				.uniqueId()
+			.uniqueId()
-				.attr( {
+			.attr( {
-					tabIndex: -1,
+				tabIndex: -1,
-					role: this._itemRole()
+				role: this._itemRole()
-				} );
+			} );
 		this._addClass( newItems, "ui-menu-item" )
 			._addClass( newWrappers, "ui-menu-item-wrapper" );
 		// Add aria-disabled attribute to any disabled menu item
 		items.filter( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
 		}
 		// Highlight active parent menu item, if any
 		activeParent = this.active
 			.parent()
-				.closest( ".ui-menu-item" )
+			.closest( ".ui-menu-item" )
-					.children( ".ui-menu-item-wrapper" );
+			.children( ".ui-menu-item-wrapper" );
 		this._addClass( activeParent, null, "ui-state-active" );
 		if ( event && event.type === "keydown" ) {
 			this._close();
 		} else {
 			// Work around active item staying active after menu is blurred
 			this._removeClass( currentMenu.find( ".ui-state-active" ), null, "ui-state-active" );
 			this.activeMenu = currentMenu;
-		}, this.delay );
+		}, all ? 0 : this.delay );
 	},
 	// With no arguments, closes the currently active menu - if nothing is active
 	// it closes all menus.  If passed an argument, it will search for menus BELOW
 	_close: function( startMenu ) {
 			this.focus( event, newItem );
 		}
 	},
 	expand: function( event ) {
-		var newItem = this.active &&
+		var newItem = this.active && this._menuItems( this.active.children( ".ui-menu" ) ).first();
-			this.active
-				.children( ".ui-menu " )
-					.find( this.options.items )
-						.first();
 		if ( newItem && newItem.length ) {
 			this._open( newItem.parent() );
 			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
 		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
 	},
 	isLastItem: function() {
 		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
+	},
+	_menuItems: function( menu ) {
+		return ( menu || this.element )
+			.find( this.options.items )
+			.filter( ".ui-menu-item" );
 	},
 	_move: function( direction, filter, event ) {
 		var next;
 		if ( this.active ) {
 			if ( direction === "first" || direction === "last" ) {
 				next = this.active
 					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
-					.eq( -1 );
+					.last();
 			} else {
 				next = this.active
 					[ direction + "All" ]( ".ui-menu-item" )
-					.eq( 0 );
+					.first();
 			}
 		}
 		if ( !next || !next.length || !this.active ) {
-			next = this.activeMenu.find( this.options.items )[ filter ]();
+			next = this._menuItems( this.activeMenu )[ filter ]();
 		}
 		this.focus( event, next );
 	},
 		if ( this.isLastItem() ) {
 			return;
 		}
 		if ( this._hasScroll() ) {
 			base = this.active.offset().top;
-			height = this.element.height();
+			height = this.element.innerHeight();
+			// jQuery 3.2 doesn't include scrollbars in innerHeight, add it back.
+			if ( $.fn.jquery.indexOf( "3.2." ) === 0 ) {
+				height += this.element[ 0 ].offsetHeight - this.element.outerHeight();
+			}
 			this.active.nextAll( ".ui-menu-item" ).each( function() {
 				item = $( this );
 				return item.offset().top - base - height < 0;
 			} );
 			this.focus( event, item );
 		} else {
-			this.focus( event, this.activeMenu.find( this.options.items )
+			this.focus( event, this._menuItems( this.activeMenu )
 				[ !this.active ? "first" : "last" ]() );
 		}
 	},
 	previousPage: function( event ) {
 		if ( this.isFirstItem() ) {
 			return;
 		}
 		if ( this._hasScroll() ) {
 			base = this.active.offset().top;
-			height = this.element.height();
+			height = this.element.innerHeight();
+			// jQuery 3.2 doesn't include scrollbars in innerHeight, add it back.
+			if ( $.fn.jquery.indexOf( "3.2." ) === 0 ) {
+				height += this.element[ 0 ].offsetHeight - this.element.outerHeight();
+			}
 			this.active.prevAll( ".ui-menu-item" ).each( function() {
 				item = $( this );
 				return item.offset().top - base + height > 0;
 			} );
 			this.focus( event, item );
 		} else {
-			this.focus( event, this.activeMenu.find( this.options.items ).first() );
+			this.focus( event, this._menuItems( this.activeMenu ).first() );
 		}
 	},
 	_hasScroll: function() {
 		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
 			regex = new RegExp( "^" + escapedCharacter, "i" );
 		return this.activeMenu
 			.find( this.options.items )
-				// Only match on items, not dividers or other content (#10571)
+			// Only match on items, not dividers or other content (#10571)
-				.filter( ".ui-menu-item" )
+			.filter( ".ui-menu-item" )
-					.filter( function() {
+			.filter( function() {
-						return regex.test(
+				return regex.test(
-							$.trim( $( this ).children( ".ui-menu-item-wrapper" ).text() ) );
+					String.prototype.trim.call(
-					} );
+						$( this ).children( ".ui-menu-item-wrapper" ).text() ) );
+			} );
 	}
 } );
-} ) );
+} );

enmi-conf.org