Merge branch 'master' into selectmenu

5 files changed, 68 insertions, 40 deletions

diff --git a/tests/unit/dialog/dialog_tickets.js b/tests/unit/dialog/dialog_tickets.js
index b203ca7d5..f8ab8b423 100644
--- a/tests/unit/dialog/dialog_tickets.js
+++ b/tests/unit/dialog/dialog_tickets.js
@@ -140,4 +140,13 @@ test("#6966: Escape key closes all dialogs, not the top one", function(){
     d1.remove();
 });
 
+test("#4980: Destroy should place element back in original DOM position", function(){
+    container = $('<div id="container"><div id="modal">Content</div></div>');
+	modal = container.find('#modal');
+	modal.dialog();
+	ok(!$.contains(container[0], modal[0]), 'dialog should move modal element to outside container element');
+	modal.dialog('destroy');
+	ok($.contains(container[0], modal[0]), 'dialog(destroy) should place element back in original DOM position');
+});
+
 })(jQuery);
diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index 79b98163b..9e68e0c67 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -93,12 +93,16 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
 		setTimeout(function() {
 			equal( $menu.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
 			$menu.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
-			equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
-			$menu.trigger( "mouseleave" );
-			equal( $menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
-			start();
-		}, 400);
-	}, 200);
+			setTimeout(function() {
+				equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+				$menu.trigger( "mouseleave" );
+				setTimeout(function() {
+					equal( $menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+					start();
+				}, 1400);
+			}, 1050);
+		}, 700);
+	}, 350);
 });
 
 asyncTest( "handle custom menu item submenu auto collapse: mouseleave", function() {
@@ -112,17 +116,19 @@ asyncTest( "handle custom menu item submenu auto collapse: mouseleave", function
 		setTimeout(function() {
 			equal( $menu.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
 			$menu.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
-			equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
-
-			$menu.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN });
-			ok( $menu.find( ".ui-state-active" ).is( "#menu5 :nth-child(7) a" ),
-				"down keypress selected an item from the first submenu" );
-			
-			$menu.trigger( "mouseleave" );
-			equal( $menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
-			start();
-		}, 400);
-	}, 200);
+			setTimeout(function() {
+				equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+				$menu.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN });
+				ok( $menu.find( ".ui-state-active" ).is( "#menu5 :nth-child(7) a" ),
+					"down keypress selected an item from the first submenu" );
+				$menu.trigger( "mouseleave" );
+				setTimeout(function() {
+					equal( $menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+					start();
+				}, 1400);
+			}, 1050);
+		}, 700);
+	}, 350);
 });
 
 
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index bd415aa2b..c054ba2dd 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -473,8 +473,8 @@ $.widget( "ui.autocomplete", {
 			this.search( null, event );
 			return;
 		}
-		if ( this.menu.first() && /^previous/.test(direction) ||
-				this.menu.last() && /^next/.test(direction) ) {
+		if ( this.menu.isFirstItem() && /^previous/.test(direction) ||
+				this.menu.isLastItem() && /^next/.test(direction) ) {
 			this._value( this.term );
 			this.menu.blur();
 			return;
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 3d7638667..1f959a837 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -77,8 +77,11 @@ $.widget("ui.dialog", {
 		// #5742 - .attr() might return a DOMElement
 		if ( typeof this.originalTitle !== "string" ) {
 			this.originalTitle = "";
-		}
-
+		}		
+		this.oldPosition = { 
+			parent: this.element.parent(), 
+			index: this.element.parent().children().index( this.element ) 
+		};
 		this.options.title = this.options.title || this.originalTitle;
 		var self = this,
 			options = self.options,
@@ -168,7 +171,8 @@ $.widget("ui.dialog", {
 	},
 
 	_destroy: function() {
-		var self = this;
+		var self = this, next, 
+			oldPosition = this.oldPosition;
 
 		if ( self.overlay ) {
 			self.overlay.destroy();
@@ -183,6 +187,13 @@ $.widget("ui.dialog", {
 		if ( self.originalTitle ) {
 			self.element.attr( "title", self.originalTitle );
 		}
+		
+		next = oldPosition.parent.children().eq( oldPosition.index );
+		if ( next.length ) {
+			next.before( self.element );
+		} else {
+			oldPosition.parent.append( self.element );
+		}		
 	},
 
 	widget: function() {
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index b73018a19..4fac02d2a 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -18,7 +18,7 @@ var idIncrement = 0;
 $.widget( "ui.menu", {
 	version: "@VERSION",
 	defaultElement: "<ul>",
-	delay: 150,
+	delay: 300,
 	options: {
 		menus: "ul",
 		position: {
@@ -332,12 +332,12 @@ $.widget( "ui.menu", {
 	},
 
 	blur: function( event ) {
+		clearTimeout( this.timer );
+
 		if ( !this.active ) {
 			return;
 		}
 
-		clearTimeout( this.timer );
-
 		this.active.children( "a" ).removeClass( "ui-state-focus" );
 		this.active = null;
 
@@ -381,20 +381,22 @@ $.widget( "ui.menu", {
 	},
 
 	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 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;
-		}
+			// 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._close( currentMenu );
 
-		this.blur( event );
-		this.activeMenu = currentMenu;
+			this.blur( event );
+			this.activeMenu = currentMenu;
+		}, this.delay);
 	},
 
 	// With no arguments, closes the currently active menu - if nothing is active
@@ -445,11 +447,11 @@ $.widget( "ui.menu", {
 		this._move( "prev", "last", event );
 	},
 
-	first: function() {
+	isFirstItem: function() {
 		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
 	},
 
-	last: function() {
+	isLastItem: function() {
 		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
 	},
 
@@ -478,7 +480,7 @@ $.widget( "ui.menu", {
 			this.focus( event, this.activeMenu.children( ".ui-menu-item" ).first() );
 			return;
 		}
-		if ( this.last() ) {
+		if ( this.isLastItem() ) {
 			return;
 		}
 		if ( this._hasScroll() ) {
@@ -502,7 +504,7 @@ $.widget( "ui.menu", {
 			this.focus( event, this.activeMenu.children( ".ui-menu-item" ).first() );
 			return;
 		}
-		if ( this.first() ) {
+		if ( this.isFirstItem() ) {
 			return;
 		}
 		if ( this._hasScroll() ) {