Merge branch 'master' into selectmenu

Author: fnagel

tests/unit/autocomplete/autocomplete_core.js

@@ -192,6 +192,34 @@ asyncTest( "handle race condition", function() {
 	}
 });
 
+asyncTest( "simultaneous searches (#9334)", function() {
+	expect( 2 );
+	var element = $( "#autocomplete" ).autocomplete({
+			source: function( request, response ) {
+				setTimeout(function() {
+					response([ request.term ]);
+				});
+			},
+			response: function() {
+				ok( true, "response from first instance" );
+			}
+		}),
+		element2 = $( "#autocomplete-textarea" ).autocomplete({
+			source: function( request, response ) {
+				setTimeout(function() {
+					response([ request.term ]);
+				});
+			},
+			response: function() {
+				ok( true, "response from second instance" );
+				start();
+			}
+		});
+
+	element.autocomplete( "search", "test" );
+	element2.autocomplete( "search", "test" );
+});
+
 test( "ARIA", function() {
 	expect( 7 );
 	var element = $( "#autocomplete" ).autocomplete({

tests/unit/resizable/resizable_events.js

@@ -170,4 +170,51 @@ test("stop", function() {
 
 });
 
+test( "resize (containment) works with parent with negative offset", function() {
+
+	expect( 1 );
+
+	var widthBefore, widthAfter,
+		handle = ".ui-resizable-e",
+		target = $( "#resizable1" ),
+		absoluteContainer = target.wrap( "<div />" ).parent(),
+		fixedContainer = absoluteContainer.wrap( "<div />" ).parent(),
+		increaseWidthBy = 50;
+
+	// position fixed container in window top left
+	fixedContainer.css({
+		width: 400,
+		height: 100,
+		position: "fixed",
+		top: 0,
+		left: 0
+	});
+
+	// position absolute container within fixed on slightly outside window
+	absoluteContainer.css({
+		width: 400,
+		height: 100,
+		position: "absolute",
+		top: 0,
+		left: -50
+	});
+
+	// set up resizable to be contained within absolute container
+	target.resizable({
+		handles: "all",
+		containment: "parent"
+	}).css({
+		width: 300
+	});
+
+	widthBefore = target.width();
+
+	TestHelpers.resizable.drag( handle, increaseWidthBy, 0 );
+
+	widthAfter = target.width();
+
+	equal( widthAfter, ( widthBefore + increaseWidthBy ), "resizable width should be increased by the value dragged" );
+
+});
+
 })(jQuery);

themes/base/jquery.ui.accordion.css

@@ -19,9 +19,6 @@
 .ui-accordion .ui-accordion-icons {
 	padding-left: 2.2em;
 }
-.ui-accordion .ui-accordion-noicons {
-	padding-left: .7em;
-}
 .ui-accordion .ui-accordion-icons .ui-accordion-icons {
 	padding-left: 2.2em;
 }

ui/jquery.ui.autocomplete.js

@@ -41,6 +41,7 @@ $.widget( "ui.autocomplete", {
 		select: null
 	},
 
+	requestIndex: 0,
 	pending: 0,
 
 	_create: function() {
@@ -414,24 +415,20 @@ $.widget( "ui.autocomplete", {
 		this.source( { term: value }, this._response() );
 	},
 
-	_response: (function() {
-		var requestIndex = 0;
+	_response: function() {
+		var index = ++this.requestIndex;
 
-		return function() {
-			var index = ++requestIndex;
-
-			return $.proxy(function( content ) {
-				if ( index === requestIndex ) {
-					this.__response( content );
-				}
+		return $.proxy(function( content ) {
+			if ( index === this.requestIndex ) {
+				this.__response( content );
+			}
 
-				this.pending--;
-				if ( !this.pending ) {
-					this.element.removeClass( "ui-autocomplete-loading" );
-				}
-			}, this );
-		};
-	})(),
+			this.pending--;
+			if ( !this.pending ) {
+				this.element.removeClass( "ui-autocomplete-loading" );
+			}
+		}, this );
+	},
 
 	__response: function( content ) {
 		if ( content ) {