]> source.dussan.org Git - jquery-ui.git/commitdiff
Menu: Move menu into widgets folder
authorAlexander Schmitz <arschmitz@gmail.com>
Wed, 15 Jul 2015 02:03:37 +0000 (22:03 -0400)
committerAlexander Schmitz <arschmitz@gmail.com>
Sat, 8 Aug 2015 04:29:38 +0000 (00:29 -0400)
Ref #13885

demos/bootstrap.js
tests/unit/menu/common.js
tests/unit/menu/core.js
tests/unit/menu/events.js
tests/unit/menu/methods.js
tests/unit/menu/options.js
ui/menu.js [deleted file]
ui/selectmenu.js
ui/widgets/autocomplete.js
ui/widgets/menu.js [new file with mode: 0644]

index c45d5e3e0e10daea2a2e80cb3f274581a04cd2b6..15f220c214b0796f4af11f42f898fd40198ce488 100644 (file)
@@ -31,7 +31,8 @@ var widgets = [
        "datepicker",
        "dialog",
        "draggable",
-       "droppable"
+       "droppable",
+       "menu"
 ];
 
 function getPath( module ) {
index 0f0a04de8801f7fa1b2360d03c120e97227e3478..81674be351cf23083f29ccc28c75fe4558d344ba 100644 (file)
@@ -1,6 +1,6 @@
 define( [
        "lib/common",
-       "ui/menu"
+       "ui/widgets/menu"
 ], function( common ) {
 
 common.testWidget( "menu", {
index dc853be3c59efe37bc0dcd0d19d0b5a1fd3759a7..68f613ee1daa46d7310cd5ba8e715064160c5c84 100644 (file)
@@ -1,7 +1,7 @@
 define( [
        "jquery",
        "./helper",
-       "ui/menu"
+       "ui/widgets/menu"
 ], function( $, testHelper ) {
 
 module( "menu: core" );
index 88a1f288c50202d37eb67d61370ea3d32d090528..8a4b92fff979f854f2c91ed21a711b320c0e47be 100644 (file)
@@ -1,7 +1,7 @@
 define( [
        "jquery",
        "./helper",
-       "ui/menu"
+       "ui/widgets/menu"
 ], function( $, testHelper ) {
 
 var log = testHelper.log,
index e322ab2144fa37cd7ad0ccc00a0f8c8f0d3ffc14..28482d65db624e3a52400ffff75005928f82cd06 100644 (file)
@@ -1,7 +1,7 @@
 define( [
        "jquery",
        "./helper",
-       "ui/menu"
+       "ui/widgets/menu"
 ], function( $, testHelper ) {
 
 var log = testHelper.log,
index 8994b026f5a9972de030a65e110467851036e75f..e22adccf68ac7402f1cef68b1643eba03bc19cf7 100644 (file)
@@ -1,7 +1,7 @@
 define( [
        "jquery",
        "./helper",
-       "ui/menu"
+       "ui/widgets/menu"
 ], function( $, testHelper ) {
 
 var log = testHelper.log,
diff --git a/ui/menu.js b/ui/menu.js
deleted file mode 100644 (file)
index 7662d32..0000000
+++ /dev/null
@@ -1,663 +0,0 @@
-/*!
- * jQuery UI Menu @VERSION
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Menu
-//>>group: Widgets
-//>>description: Creates nestable menus.
-//>>docs: http://api.jqueryui.com/menu/
-//>>demos: http://jqueryui.com/menu/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/menu.css
-//>>css.theme: ../themes/base/theme.css
-
-( function( factory ) {
-       if ( typeof define === "function" && define.amd ) {
-
-               // AMD. Register as an anonymous module.
-               define( [
-                       "jquery",
-                       "./core",
-                       "./version",
-                       "./keycode",
-                       "./position",
-                       "./safe-active-element",
-                       "./unique-id",
-                       "./widget"
-               ], factory );
-       } else {
-
-               // Browser globals
-               factory( jQuery );
-       }
-}( function( $ ) {
-
-return $.widget( "ui.menu", {
-       version: "@VERSION",
-       defaultElement: "<ul>",
-       delay: 300,
-       options: {
-               icons: {
-                       submenu: "ui-icon-caret-1-e"
-               },
-               items: "> *",
-               menus: "ul",
-               position: {
-                       my: "left top",
-                       at: "right top"
-               },
-               role: "menu",
-
-               // callbacks
-               blur: null,
-               focus: null,
-               select: null
-       },
-
-       _create: function() {
-               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.element
-                       .uniqueId()
-                       .attr( {
-                               role: this.options.role,
-                               tabIndex: 0
-                       } );
-
-               if ( this.options.disabled ) {
-                       this._addClass( null, "ui-state-disabled" );
-                       this.element.attr( "aria-disabled", "true" );
-               }
-
-               this._addClass( "ui-menu", "ui-widget ui-widget-content" );
-               this._on( {
-
-                       // 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();
-                       },
-                       "click .ui-menu-item": function( event ) {
-                               var target = $( event.target );
-                               if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
-                                       this.select( event );
-
-                                       // Only set the mouseHandled flag if the event will bubble, see #9469.
-                                       if ( !event.isPropagationStopped() ) {
-                                               this.mouseHandled = true;
-                                       }
-
-                                       // Open submenu on click
-                                       if ( target.has( ".ui-menu" ).length ) {
-                                               this.expand( event );
-                                       } else if ( !this.element.is( ":focus" ) && $( $.ui.safeActiveElement( this.document[ 0 ] ) ).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.
-                                               // Otherwise, blur the active item since it is no longer visible.
-                                               if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
-                                                       clearTimeout( this.timer );
-                                               }
-                                       }
-                               }
-                       },
-                       "mouseenter .ui-menu-item": 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;
-                               }
-
-                               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 );
-
-                               if ( !keepActiveItem ) {
-                                       this.focus( event, item );
-                               }
-                       },
-                       blur: function( event ) {
-                               this._delay( function() {
-                                       if ( !$.contains( this.element[ 0 ], $.ui.safeActiveElement( this.document[ 0 ] ) ) ) {
-                                               this.collapseAll( event );
-                                       }
-                               } );
-                       },
-                       keydown: "_keydown"
-               } );
-
-               this.refresh();
-
-               // Clicks outside of a menu collapse any open menus
-               this._on( this.document, {
-                       click: function( event ) {
-                               if ( this._closeOnDocumentClick( event ) ) {
-                                       this.collapseAll( event );
-                               }
-
-                               // Reset the mouseHandled flag
-                               this.mouseHandled = false;
-                       }
-               } );
-       },
-
-       _destroy: function() {
-               var items = this.element.find( ".ui-menu-item" )
-                               .removeAttr( "role aria-disabled" ),
-                       submenus = items.children( ".ui-menu-item-wrapper" )
-                               .removeUniqueId()
-                               .removeAttr( "tabIndex role aria-haspopup" );
-
-               // Destroy (sub)menus
-               this.element
-                       .removeAttr( "aria-activedescendant" )
-                       .find( ".ui-menu" ).addBack()
-                               .removeAttr( "role aria-labelledby aria-expanded aria-hidden aria-disabled " +
-                                       "tabIndex" )
-                               .removeUniqueId()
-                               .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:
-                       this.previousPage( event );
-                       break;
-               case $.ui.keyCode.PAGE_DOWN:
-                       this.nextPage( event );
-                       break;
-               case $.ui.keyCode.HOME:
-                       this._move( "first", "first", event );
-                       break;
-               case $.ui.keyCode.END:
-                       this._move( "last", "last", event );
-                       break;
-               case $.ui.keyCode.UP:
-                       this.previous( event );
-                       break;
-               case $.ui.keyCode.DOWN:
-                       this.next( event );
-                       break;
-               case $.ui.keyCode.LEFT:
-                       this.collapse( event );
-                       break;
-               case $.ui.keyCode.RIGHT:
-                       if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
-                               this.expand( event );
-                       }
-                       break;
-               case $.ui.keyCode.ENTER:
-               case $.ui.keyCode.SPACE:
-                       this._activate( event );
-                       break;
-               case $.ui.keyCode.ESCAPE:
-                       this.collapse( event );
-                       break;
-               default:
-                       preventDefault = false;
-                       prev = this.previousFilter || "";
-                       character = String.fromCharCode( event.keyCode );
-                       skip = false;
-
-                       clearTimeout( this.filterTimer );
-
-                       if ( character === prev ) {
-                               skip = true;
-                       } else {
-                               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 );
-                       }
-
-                       if ( match.length ) {
-                               this.focus( event, match );
-                               this.previousFilter = character;
-                               this.filterTimer = this._delay( function() {
-                                       delete this.previousFilter;
-                               }, 1000 );
-                       } else {
-                               delete this.previousFilter;
-                       }
-               }
-
-               if ( preventDefault ) {
-                       event.preventDefault();
-               }
-       },
-
-       _activate: function( event ) {
-               if ( !this.active.is( ".ui-state-disabled" ) ) {
-                       if ( this.active.children( "[aria-haspopup='true']" ).length ) {
-                               this.expand( event );
-                       } else {
-                               this.select( event );
-                       }
-               }
-       },
-
-       refresh: function() {
-               var menus, items, newSubmenus, newItems, newWrappers,
-                       that = this,
-                       icon = this.options.icons.submenu,
-                       submenus = this.element.find( this.options.menus );
-
-               this._toggleClass( "ui-menu-icons", null, !!this.element.find( ".ui-icon" ).length );
-
-               // Initialize nested menus
-               newSubmenus = submenus.filter( ":not(.ui-menu)" )
-                       .hide()
-                       .attr( {
-                               role: this.options.role,
-                               "aria-hidden": "true",
-                               "aria-expanded": "false"
-                       } )
-                       .each( function() {
-                               var menu = $( this ),
-                                       item = menu.prev(),
-                                       submenuCaret = $( "<span>" ).data( "ui-menu-submenu-caret", true );
-
-                               that._addClass( submenuCaret, "ui-menu-icon", "ui-icon " + icon );
-                               item
-                                       .attr( "aria-haspopup", "true" )
-                                       .prepend( submenuCaret );
-                               menu.attr( "aria-labelledby", item.attr( "id" ) );
-                       } );
-
-               this._addClass( newSubmenus, "ui-menu", "ui-widget ui-widget-content ui-front" );
-
-               menus = submenus.add( this.element );
-               items = menus.find( this.options.items );
-
-               // Initialize menu-items containing spaces and/or dashes only as dividers
-               items.not( ".ui-menu-item" ).each( function() {
-                       var item = $( this );
-                       if ( that._isDivider( item ) ) {
-                               that._addClass( item, "ui-menu-divider", "ui-widget-content" );
-                       }
-               } );
-
-               // 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()
-                               .attr( {
-                                       tabIndex: -1,
-                                       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" );
-
-               // If the active item has been removed, blur the menu
-               if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-                       this.blur();
-               }
-       },
-
-       _itemRole: function() {
-               return {
-                       menu: "menuitem",
-                       listbox: "option"
-               }[ this.options.role ];
-       },
-
-       _setOption: function( key, value ) {
-               if ( key === "icons" ) {
-                       var icons = this.element.find( ".ui-menu-icon" );
-                       this._removeClass( icons, null, this.options.icons.submenu )
-                               ._addClass( icons, null, value.submenu );
-               }
-               if ( key === "disabled" ) {
-                       this.element.attr( "aria-disabled", value );
-                       this._toggleClass( null, "ui-state-disabled", !!value );
-               }
-               this._super( key, value );
-       },
-
-       focus: function( event, item ) {
-               var nested, focused, activeParent;
-               this.blur( event, event && event.type === "focus" );
-
-               this._scrollIntoView( item );
-
-               this.active = item.first();
-
-               focused = this.active.children( ".ui-menu-item-wrapper" );
-               this._addClass( focused, null, "ui-state-active" );
-
-               // Only update aria-activedescendant if there's a role
-               // otherwise we assume focus is managed elsewhere
-               if ( this.options.role ) {
-                       this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
-               }
-
-               // Highlight active parent menu item, if any
-               activeParent = this.active
-                       .parent()
-                               .closest( ".ui-menu-item" )
-                                       .children( ".ui-menu-item-wrapper" );
-               this._addClass( activeParent, null, "ui-state-active" );
-
-               if ( event && event.type === "keydown" ) {
-                       this._close();
-               } else {
-                       this.timer = this._delay( function() {
-                               this._close();
-                       }, this.delay );
-               }
-
-               nested = item.children( ".ui-menu" );
-               if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
-                       this._startOpening( nested );
-               }
-               this.activeMenu = item.parent();
-
-               this._trigger( "focus", event, { item: item } );
-       },
-
-       _scrollIntoView: function( item ) {
-               var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
-               if ( this._hasScroll() ) {
-                       borderTop = parseFloat( $.css( this.activeMenu[ 0 ], "borderTopWidth" ) ) || 0;
-                       paddingTop = parseFloat( $.css( this.activeMenu[ 0 ], "paddingTop" ) ) || 0;
-                       offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
-                       scroll = this.activeMenu.scrollTop();
-                       elementHeight = this.activeMenu.height();
-                       itemHeight = item.outerHeight();
-
-                       if ( offset < 0 ) {
-                               this.activeMenu.scrollTop( scroll + offset );
-                       } else if ( offset + itemHeight > elementHeight ) {
-                               this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
-                       }
-               }
-       },
-
-       blur: function( event, fromFocus ) {
-               if ( !fromFocus ) {
-                       clearTimeout( this.timer );
-               }
-
-               if ( !this.active ) {
-                       return;
-               }
-
-               this._removeClass( this.active.children( ".ui-menu-item-wrapper" ),
-                       null, "ui-state-active" );
-               this.active = null;
-
-               this._trigger( "blur", event, { item: this.active } );
-       },
-
-       _startOpening: function( submenu ) {
-               clearTimeout( this.timer );
-
-               // Don't open if already open fixes a Firefox bug that caused a .5 pixel
-               // shift in the submenu position when mousing over the caret icon
-               if ( submenu.attr( "aria-hidden" ) !== "true" ) {
-                       return;
-               }
-
-               this.timer = this._delay( function() {
-                       this._close();
-                       this._open( submenu );
-               }, this.delay );
-       },
-
-       _open: function( submenu ) {
-               var position = $.extend( {
-                       of: this.active
-               }, this.options.position );
-
-               clearTimeout( this.timer );
-               this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
-                       .hide()
-                       .attr( "aria-hidden", "true" );
-
-               submenu
-                       .show()
-                       .removeAttr( "aria-hidden" )
-                       .attr( "aria-expanded", "true" )
-                       .position( position );
-       },
-
-       collapseAll: function( event, all ) {
-               clearTimeout( this.timer );
-               this.timer = this._delay( function() {
-                       // If we were passed an event, look for the submenu that contains the event
-                       var currentMenu = all ? this.element :
-                               $( event && event.target ).closest( this.element.find( ".ui-menu" ) );
-
-                       // If we found no valid submenu ancestor, use the main menu to close all sub menus anyway
-                       if ( !currentMenu.length ) {
-                               currentMenu = this.element;
-                       }
-
-                       this._close( currentMenu );
-
-                       this.blur( event );
-                       this.activeMenu = currentMenu;
-               }, 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 ) {
-               if ( !startMenu ) {
-                       startMenu = this.active ? this.active.parent() : this.element;
-               }
-
-               var active = startMenu
-                       .find( ".ui-menu" )
-                               .hide()
-                               .attr( "aria-hidden", "true" )
-                               .attr( "aria-expanded", "false" )
-                       .end()
-                       .find( ".ui-state-active" ).not( ".ui-menu-item-wrapper" );
-               this._removeClass( active, null, "ui-state-active" );
-       },
-
-       _closeOnDocumentClick: function( event ) {
-               return !$( event.target ).closest( ".ui-menu" ).length;
-       },
-
-       _isDivider: function( item ) {
-
-               // Match hyphen, em dash, en dash
-               return !/[^\-\u2014\u2013\s]/.test( item.text() );
-       },
-
-       collapse: function( event ) {
-               var newItem = this.active &&
-                       this.active.parent().closest( ".ui-menu-item", this.element );
-               if ( newItem && newItem.length ) {
-                       this._close();
-                       this.focus( event, newItem );
-               }
-       },
-
-       expand: function( event ) {
-               var newItem = this.active &&
-                       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
-                       this._delay( function() {
-                               this.focus( event, newItem );
-                       } );
-               }
-       },
-
-       next: function( event ) {
-               this._move( "next", "first", event );
-       },
-
-       previous: function( event ) {
-               this._move( "prev", "last", event );
-       },
-
-       isFirstItem: function() {
-               return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
-       },
-
-       isLastItem: function() {
-               return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
-       },
-
-       _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 );
-                       } else {
-                               next = this.active
-                                       [ direction + "All" ]( ".ui-menu-item" )
-                                       .eq( 0 );
-                       }
-               }
-               if ( !next || !next.length || !this.active ) {
-                       next = this.activeMenu.find( this.options.items )[ filter ]();
-               }
-
-               this.focus( event, next );
-       },
-
-       nextPage: function( event ) {
-               var item, base, height;
-
-               if ( !this.active ) {
-                       this.next( event );
-                       return;
-               }
-               if ( this.isLastItem() ) {
-                       return;
-               }
-               if ( this._hasScroll() ) {
-                       base = this.active.offset().top;
-                       height = this.element.height();
-                       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.active ? "first" : "last" ]() );
-               }
-       },
-
-       previousPage: function( event ) {
-               var item, base, height;
-               if ( !this.active ) {
-                       this.next( event );
-                       return;
-               }
-               if ( this.isFirstItem() ) {
-                       return;
-               }
-               if ( this._hasScroll() ) {
-                       base = this.active.offset().top;
-                       height = this.element.height();
-                       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() );
-               }
-       },
-
-       _hasScroll: function() {
-               return this.element.outerHeight() < this.element.prop( "scrollHeight" );
-       },
-
-       select: function( event ) {
-               // TODO: It should never be possible to not have an active item at this
-               // point, but the tests don't trigger mouseenter before click.
-               this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
-               var ui = { item: this.active };
-               if ( !this.active.has( ".ui-menu" ).length ) {
-                       this.collapseAll( event, true );
-               }
-               this._trigger( "select", event, ui );
-       },
-
-       _filterMenuItems: function( character ) {
-               var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
-                       regex = new RegExp( "^" + escapedCharacter, "i" );
-
-               return this.activeMenu
-                       .find( this.options.items )
-
-                               // Only match on items, not dividers or other content (#10571)
-                               .filter( ".ui-menu-item" )
-                                       .filter( function() {
-                                               return regex.test(
-                                                       $.trim( $( this ).children( ".ui-menu-item-wrapper" ).text() ) );
-                                       } );
-       }
-} );
-
-} ) );
index 1cd50d1275b36cd6b84f1059a335a90e2b2347dd..19a9a05fe4e60a2d37e4f1282715513aad850764 100644 (file)
@@ -24,7 +24,7 @@
                        "jquery",
                        "./version",
                        "./escape-selector",
-                       "./menu",
+                       "./widgets/menu",
                        "./keycode",
                        "./labels",
                        "./position",
index b91d6f11393b2cca9ac1149af3eaa808aab255d9..a36282dd56f76273133ee8d8cda530f477c22041 100644 (file)
@@ -22,7 +22,7 @@
                // AMD. Register as an anonymous module.
                define( [
                        "jquery",
-                       "../menu",
+                       "./menu",
                        "../keycode",
                        "../position",
                        "../safe-active-element",
diff --git a/ui/widgets/menu.js b/ui/widgets/menu.js
new file mode 100644 (file)
index 0000000..3e1f71a
--- /dev/null
@@ -0,0 +1,662 @@
+/*!
+ * jQuery UI Menu @VERSION
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Menu
+//>>group: Widgets
+//>>description: Creates nestable menus.
+//>>docs: http://api.jqueryui.com/menu/
+//>>demos: http://jqueryui.com/menu/
+//>>css.structure: ../themes/base/core.css
+//>>css.structure: ../themes/base/menu.css
+//>>css.theme: ../themes/base/theme.css
+
+( function( factory ) {
+       if ( typeof define === "function" && define.amd ) {
+
+               // AMD. Register as an anonymous module.
+               define( [
+                       "jquery",
+                       "../keycode",
+                       "../position",
+                       "../safe-active-element",
+                       "../unique-id",
+                       "../version",
+                       "../widget"
+               ], factory );
+       } else {
+
+               // Browser globals
+               factory( jQuery );
+       }
+}( function( $ ) {
+
+return $.widget( "ui.menu", {
+       version: "@VERSION",
+       defaultElement: "<ul>",
+       delay: 300,
+       options: {
+               icons: {
+                       submenu: "ui-icon-caret-1-e"
+               },
+               items: "> *",
+               menus: "ul",
+               position: {
+                       my: "left top",
+                       at: "right top"
+               },
+               role: "menu",
+
+               // callbacks
+               blur: null,
+               focus: null,
+               select: null
+       },
+
+       _create: function() {
+               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.element
+                       .uniqueId()
+                       .attr( {
+                               role: this.options.role,
+                               tabIndex: 0
+                       } );
+
+               if ( this.options.disabled ) {
+                       this._addClass( null, "ui-state-disabled" );
+                       this.element.attr( "aria-disabled", "true" );
+               }
+
+               this._addClass( "ui-menu", "ui-widget ui-widget-content" );
+               this._on( {
+
+                       // 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();
+                       },
+                       "click .ui-menu-item": function( event ) {
+                               var target = $( event.target );
+                               if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
+                                       this.select( event );
+
+                                       // Only set the mouseHandled flag if the event will bubble, see #9469.
+                                       if ( !event.isPropagationStopped() ) {
+                                               this.mouseHandled = true;
+                                       }
+
+                                       // Open submenu on click
+                                       if ( target.has( ".ui-menu" ).length ) {
+                                               this.expand( event );
+                                       } else if ( !this.element.is( ":focus" ) && $( $.ui.safeActiveElement( this.document[ 0 ] ) ).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.
+                                               // Otherwise, blur the active item since it is no longer visible.
+                                               if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
+                                                       clearTimeout( this.timer );
+                                               }
+                                       }
+                               }
+                       },
+                       "mouseenter .ui-menu-item": 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;
+                               }
+
+                               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 );
+
+                               if ( !keepActiveItem ) {
+                                       this.focus( event, item );
+                               }
+                       },
+                       blur: function( event ) {
+                               this._delay( function() {
+                                       if ( !$.contains( this.element[ 0 ], $.ui.safeActiveElement( this.document[ 0 ] ) ) ) {
+                                               this.collapseAll( event );
+                                       }
+                               } );
+                       },
+                       keydown: "_keydown"
+               } );
+
+               this.refresh();
+
+               // Clicks outside of a menu collapse any open menus
+               this._on( this.document, {
+                       click: function( event ) {
+                               if ( this._closeOnDocumentClick( event ) ) {
+                                       this.collapseAll( event );
+                               }
+
+                               // Reset the mouseHandled flag
+                               this.mouseHandled = false;
+                       }
+               } );
+       },
+
+       _destroy: function() {
+               var items = this.element.find( ".ui-menu-item" )
+                               .removeAttr( "role aria-disabled" ),
+                       submenus = items.children( ".ui-menu-item-wrapper" )
+                               .removeUniqueId()
+                               .removeAttr( "tabIndex role aria-haspopup" );
+
+               // Destroy (sub)menus
+               this.element
+                       .removeAttr( "aria-activedescendant" )
+                       .find( ".ui-menu" ).addBack()
+                               .removeAttr( "role aria-labelledby aria-expanded aria-hidden aria-disabled " +
+                                       "tabIndex" )
+                               .removeUniqueId()
+                               .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:
+                       this.previousPage( event );
+                       break;
+               case $.ui.keyCode.PAGE_DOWN:
+                       this.nextPage( event );
+                       break;
+               case $.ui.keyCode.HOME:
+                       this._move( "first", "first", event );
+                       break;
+               case $.ui.keyCode.END:
+                       this._move( "last", "last", event );
+                       break;
+               case $.ui.keyCode.UP:
+                       this.previous( event );
+                       break;
+               case $.ui.keyCode.DOWN:
+                       this.next( event );
+                       break;
+               case $.ui.keyCode.LEFT:
+                       this.collapse( event );
+                       break;
+               case $.ui.keyCode.RIGHT:
+                       if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
+                               this.expand( event );
+                       }
+                       break;
+               case $.ui.keyCode.ENTER:
+               case $.ui.keyCode.SPACE:
+                       this._activate( event );
+                       break;
+               case $.ui.keyCode.ESCAPE:
+                       this.collapse( event );
+                       break;
+               default:
+                       preventDefault = false;
+                       prev = this.previousFilter || "";
+                       character = String.fromCharCode( event.keyCode );
+                       skip = false;
+
+                       clearTimeout( this.filterTimer );
+
+                       if ( character === prev ) {
+                               skip = true;
+                       } else {
+                               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 );
+                       }
+
+                       if ( match.length ) {
+                               this.focus( event, match );
+                               this.previousFilter = character;
+                               this.filterTimer = this._delay( function() {
+                                       delete this.previousFilter;
+                               }, 1000 );
+                       } else {
+                               delete this.previousFilter;
+                       }
+               }
+
+               if ( preventDefault ) {
+                       event.preventDefault();
+               }
+       },
+
+       _activate: function( event ) {
+               if ( !this.active.is( ".ui-state-disabled" ) ) {
+                       if ( this.active.children( "[aria-haspopup='true']" ).length ) {
+                               this.expand( event );
+                       } else {
+                               this.select( event );
+                       }
+               }
+       },
+
+       refresh: function() {
+               var menus, items, newSubmenus, newItems, newWrappers,
+                       that = this,
+                       icon = this.options.icons.submenu,
+                       submenus = this.element.find( this.options.menus );
+
+               this._toggleClass( "ui-menu-icons", null, !!this.element.find( ".ui-icon" ).length );
+
+               // Initialize nested menus
+               newSubmenus = submenus.filter( ":not(.ui-menu)" )
+                       .hide()
+                       .attr( {
+                               role: this.options.role,
+                               "aria-hidden": "true",
+                               "aria-expanded": "false"
+                       } )
+                       .each( function() {
+                               var menu = $( this ),
+                                       item = menu.prev(),
+                                       submenuCaret = $( "<span>" ).data( "ui-menu-submenu-caret", true );
+
+                               that._addClass( submenuCaret, "ui-menu-icon", "ui-icon " + icon );
+                               item
+                                       .attr( "aria-haspopup", "true" )
+                                       .prepend( submenuCaret );
+                               menu.attr( "aria-labelledby", item.attr( "id" ) );
+                       } );
+
+               this._addClass( newSubmenus, "ui-menu", "ui-widget ui-widget-content ui-front" );
+
+               menus = submenus.add( this.element );
+               items = menus.find( this.options.items );
+
+               // Initialize menu-items containing spaces and/or dashes only as dividers
+               items.not( ".ui-menu-item" ).each( function() {
+                       var item = $( this );
+                       if ( that._isDivider( item ) ) {
+                               that._addClass( item, "ui-menu-divider", "ui-widget-content" );
+                       }
+               } );
+
+               // 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()
+                               .attr( {
+                                       tabIndex: -1,
+                                       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" );
+
+               // If the active item has been removed, blur the menu
+               if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+                       this.blur();
+               }
+       },
+
+       _itemRole: function() {
+               return {
+                       menu: "menuitem",
+                       listbox: "option"
+               }[ this.options.role ];
+       },
+
+       _setOption: function( key, value ) {
+               if ( key === "icons" ) {
+                       var icons = this.element.find( ".ui-menu-icon" );
+                       this._removeClass( icons, null, this.options.icons.submenu )
+                               ._addClass( icons, null, value.submenu );
+               }
+               if ( key === "disabled" ) {
+                       this.element.attr( "aria-disabled", value );
+                       this._toggleClass( null, "ui-state-disabled", !!value );
+               }
+               this._super( key, value );
+       },
+
+       focus: function( event, item ) {
+               var nested, focused, activeParent;
+               this.blur( event, event && event.type === "focus" );
+
+               this._scrollIntoView( item );
+
+               this.active = item.first();
+
+               focused = this.active.children( ".ui-menu-item-wrapper" );
+               this._addClass( focused, null, "ui-state-active" );
+
+               // Only update aria-activedescendant if there's a role
+               // otherwise we assume focus is managed elsewhere
+               if ( this.options.role ) {
+                       this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
+               }
+
+               // Highlight active parent menu item, if any
+               activeParent = this.active
+                       .parent()
+                               .closest( ".ui-menu-item" )
+                                       .children( ".ui-menu-item-wrapper" );
+               this._addClass( activeParent, null, "ui-state-active" );
+
+               if ( event && event.type === "keydown" ) {
+                       this._close();
+               } else {
+                       this.timer = this._delay( function() {
+                               this._close();
+                       }, this.delay );
+               }
+
+               nested = item.children( ".ui-menu" );
+               if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
+                       this._startOpening( nested );
+               }
+               this.activeMenu = item.parent();
+
+               this._trigger( "focus", event, { item: item } );
+       },
+
+       _scrollIntoView: function( item ) {
+               var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
+               if ( this._hasScroll() ) {
+                       borderTop = parseFloat( $.css( this.activeMenu[ 0 ], "borderTopWidth" ) ) || 0;
+                       paddingTop = parseFloat( $.css( this.activeMenu[ 0 ], "paddingTop" ) ) || 0;
+                       offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
+                       scroll = this.activeMenu.scrollTop();
+                       elementHeight = this.activeMenu.height();
+                       itemHeight = item.outerHeight();
+
+                       if ( offset < 0 ) {
+                               this.activeMenu.scrollTop( scroll + offset );
+                       } else if ( offset + itemHeight > elementHeight ) {
+                               this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
+                       }
+               }
+       },
+
+       blur: function( event, fromFocus ) {
+               if ( !fromFocus ) {
+                       clearTimeout( this.timer );
+               }
+
+               if ( !this.active ) {
+                       return;
+               }
+
+               this._removeClass( this.active.children( ".ui-menu-item-wrapper" ),
+                       null, "ui-state-active" );
+               this.active = null;
+
+               this._trigger( "blur", event, { item: this.active } );
+       },
+
+       _startOpening: function( submenu ) {
+               clearTimeout( this.timer );
+
+               // Don't open if already open fixes a Firefox bug that caused a .5 pixel
+               // shift in the submenu position when mousing over the caret icon
+               if ( submenu.attr( "aria-hidden" ) !== "true" ) {
+                       return;
+               }
+
+               this.timer = this._delay( function() {
+                       this._close();
+                       this._open( submenu );
+               }, this.delay );
+       },
+
+       _open: function( submenu ) {
+               var position = $.extend( {
+                       of: this.active
+               }, this.options.position );
+
+               clearTimeout( this.timer );
+               this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
+                       .hide()
+                       .attr( "aria-hidden", "true" );
+
+               submenu
+                       .show()
+                       .removeAttr( "aria-hidden" )
+                       .attr( "aria-expanded", "true" )
+                       .position( position );
+       },
+
+       collapseAll: function( event, all ) {
+               clearTimeout( this.timer );
+               this.timer = this._delay( function() {
+                       // If we were passed an event, look for the submenu that contains the event
+                       var currentMenu = all ? this.element :
+                               $( event && event.target ).closest( this.element.find( ".ui-menu" ) );
+
+                       // If we found no valid submenu ancestor, use the main menu to close all sub menus anyway
+                       if ( !currentMenu.length ) {
+                               currentMenu = this.element;
+                       }
+
+                       this._close( currentMenu );
+
+                       this.blur( event );
+                       this.activeMenu = currentMenu;
+               }, 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 ) {
+               if ( !startMenu ) {
+                       startMenu = this.active ? this.active.parent() : this.element;
+               }
+
+               var active = startMenu
+                       .find( ".ui-menu" )
+                               .hide()
+                               .attr( "aria-hidden", "true" )
+                               .attr( "aria-expanded", "false" )
+                       .end()
+                       .find( ".ui-state-active" ).not( ".ui-menu-item-wrapper" );
+               this._removeClass( active, null, "ui-state-active" );
+       },
+
+       _closeOnDocumentClick: function( event ) {
+               return !$( event.target ).closest( ".ui-menu" ).length;
+       },
+
+       _isDivider: function( item ) {
+
+               // Match hyphen, em dash, en dash
+               return !/[^\-\u2014\u2013\s]/.test( item.text() );
+       },
+
+       collapse: function( event ) {
+               var newItem = this.active &&
+                       this.active.parent().closest( ".ui-menu-item", this.element );
+               if ( newItem && newItem.length ) {
+                       this._close();
+                       this.focus( event, newItem );
+               }
+       },
+
+       expand: function( event ) {
+               var newItem = this.active &&
+                       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
+                       this._delay( function() {
+                               this.focus( event, newItem );
+                       } );
+               }
+       },
+
+       next: function( event ) {
+               this._move( "next", "first", event );
+       },
+
+       previous: function( event ) {
+               this._move( "prev", "last", event );
+       },
+
+       isFirstItem: function() {
+               return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
+       },
+
+       isLastItem: function() {
+               return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
+       },
+
+       _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 );
+                       } else {
+                               next = this.active
+                                       [ direction + "All" ]( ".ui-menu-item" )
+                                       .eq( 0 );
+                       }
+               }
+               if ( !next || !next.length || !this.active ) {
+                       next = this.activeMenu.find( this.options.items )[ filter ]();
+               }
+
+               this.focus( event, next );
+       },
+
+       nextPage: function( event ) {
+               var item, base, height;
+
+               if ( !this.active ) {
+                       this.next( event );
+                       return;
+               }
+               if ( this.isLastItem() ) {
+                       return;
+               }
+               if ( this._hasScroll() ) {
+                       base = this.active.offset().top;
+                       height = this.element.height();
+                       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.active ? "first" : "last" ]() );
+               }
+       },
+
+       previousPage: function( event ) {
+               var item, base, height;
+               if ( !this.active ) {
+                       this.next( event );
+                       return;
+               }
+               if ( this.isFirstItem() ) {
+                       return;
+               }
+               if ( this._hasScroll() ) {
+                       base = this.active.offset().top;
+                       height = this.element.height();
+                       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() );
+               }
+       },
+
+       _hasScroll: function() {
+               return this.element.outerHeight() < this.element.prop( "scrollHeight" );
+       },
+
+       select: function( event ) {
+               // TODO: It should never be possible to not have an active item at this
+               // point, but the tests don't trigger mouseenter before click.
+               this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
+               var ui = { item: this.active };
+               if ( !this.active.has( ".ui-menu" ).length ) {
+                       this.collapseAll( event, true );
+               }
+               this._trigger( "select", event, ui );
+       },
+
+       _filterMenuItems: function( character ) {
+               var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
+                       regex = new RegExp( "^" + escapedCharacter, "i" );
+
+               return this.activeMenu
+                       .find( this.options.items )
+
+                               // Only match on items, not dividers or other content (#10571)
+                               .filter( ".ui-menu-item" )
+                                       .filter( function() {
+                                               return regex.test(
+                                                       $.trim( $( this ).children( ".ui-menu-item-wrapper" ).text() ) );
+                                       } );
+       }
+} );
+
+} ) );