Merge branch 'master' into selectmenu

1 files changed, 1 insertions, 20 deletions

diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 4fac02d2a..83ea3c3c0 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -24,8 +24,7 @@ $.widget( "ui.menu", {
 		position: {
 			my: "left top",
 			at: "right top"
-		},
-		trigger: null
+		}
 	},
 	_create: function() {
 		this.activeMenu = this.element;
@@ -214,24 +213,10 @@ $.widget( "ui.menu", {
 				}
 			}
 		});
-
-		if ( this.options.trigger ) {
-			this.element.popup({
-				trigger: this.options.trigger,
-				managed: true,
-				focusPopup: $.proxy( function( event, ui ) {
-					this.focus( event, this.element.children( ".ui-menu-item" ).first() );
-					this.element.focus( 1 );
-				}, this)
-			});
-		}
 	},
 
 	_destroy: function() {
 		//destroy (sub)menus
-		if ( this.options.trigger ) {
-			this.element.popup( "destroy" );
-		}
 		this.element
 			.removeAttr( "aria-activedescendant" )
 			.find( ".ui-menu" )
@@ -533,10 +518,6 @@ $.widget( "ui.menu", {
 			item: this.active
 		};
 		this.collapseAll( event, true );
-		if ( this.options.trigger ) {
-			$( this.options.trigger ).focus( 1 );
-			this.element.popup( "close" );
-		}
 		this._trigger( "select", event, ui );
 	}
 });