3 files changed, 38 insertions, 19 deletions

diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index 638119579..7650aa8f4 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -451,7 +451,7 @@ $.extend( $.effects, {
 	setTransition: function( element, list, factor, value ) {
 		value = value || {};
 		$.each( list, function(i, x){
-			unit = element.cssUnit( x );
+			var unit = element.cssUnit( x );
 			if ( unit[ 0 ] > 0 ) value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
 		});
 		return value;
diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js
index 843aa2241..b5c49ce7c 100644
--- a/ui/jquery.effects.scale.js
+++ b/ui/jquery.effects.scale.js
@@ -115,11 +115,15 @@ $.effects.effect.size = function( o ) {
 			restore = o.restore || false,
 			scale = o.scale || 'both',
 			origin = o.origin,
-			original = {
-				height: el.height(), 
-				width: el.width()
-			},
-			baseline, factor;
+			original, baseline, factor;
+
+		if ( mode === "show" ) {
+			el.show();
+		}
+		original = {
+			height: el.height(), 
+			width: el.width()
+		};
 
 		el.from = o.from || original;
 		el.to = o.to || original;
@@ -149,14 +153,14 @@ $.effects.effect.size = function( o ) {
 		if ( scale == 'box' || scale == 'both' ) {
 
 			// Vertical props scaling
-			if ( factor.from.y != factor.to.y ) { 
+			if ( factor.from.y !== factor.to.y ) { 
 				props = props.concat( vProps );
 				el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from );
 				el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to );
 			};
 
 			// Horizontal props scaling
-			if ( factor.from.x != factor.to.x ) { 
+			if ( factor.from.x !== factor.to.x ) { 
 				props = props.concat( hProps );
 				el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from );
 				el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to );
@@ -167,7 +171,7 @@ $.effects.effect.size = function( o ) {
 		if ( scale == 'content' || scale == 'both' ) { 
 
 			// Vertical props scaling
-			if ( factor.from.y != factor.to.y ) { 
+			if ( factor.from.y !== factor.to.y ) { 
 				props = props.concat( cProps );
 				el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
 				el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 0e62ccfdb..f6573174a 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -47,7 +47,8 @@ $.widget( "ui.autocomplete", {
 	_create: function() {
 		var self = this,
 			doc = this.element[ 0 ].ownerDocument,
-			suppressKeyPress;
+			suppressKeyPress,
+			suppressInput;
 
 		this.valueMethod = this.element[ this.element.is( "input" ) ? "val" : "text" ];
 
@@ -63,10 +64,12 @@ $.widget( "ui.autocomplete", {
 			.bind( "keydown.autocomplete", function( event ) {
 				if ( self.options.disabled || self.element.attr( "readonly" ) ) {
                     suppressKeyPress = true;
+					suppressInput = true;
 					return;
 				}
 
 				suppressKeyPress = false;
+				suppressInput = false;
 				var keyCode = $.ui.keyCode;
 				switch( event.keyCode ) {
 				case keyCode.PAGE_UP:
@@ -110,15 +113,8 @@ $.widget( "ui.autocomplete", {
 					self.close( event );
 					break;
 				default:
-					// keypress is triggered before the input value is changed
-					clearTimeout( self.searching );
-					self.searching = setTimeout(function() {
-						// only search if the value has changed
-						if ( self.term != self._value() ) {
-							self.selectedItem = null;
-							self.search( null, event );
-						}
-					}, self.options.delay );
+					// search timeout should be triggered before the input value is changed
+					self._searchTimeout( event );
 					break;
 				}
 			})
@@ -150,6 +146,14 @@ $.widget( "ui.autocomplete", {
 					break;
                 }
 			})
+			.bind( "input.autocomplete", function(event) {
+				if ( suppressInput ) {
+					suppressInput = false;
+					event.preventDefault();
+					return;
+				}
+				self._searchTimeout( event );
+			})
 			.bind( "focus.autocomplete", function() {
 				if ( self.options.disabled ) {
 					return;
@@ -317,6 +321,17 @@ $.widget( "ui.autocomplete", {
 		}
 	},
 
+	_searchTimeout: function( event ) {
+		var self = this;
+		self.searching = setTimeout(function() {
+			// only search if the value has changed
+			if ( self.term != self.element.val() ) {
+				self.selectedItem = null;
+				self.search( null, event );
+			}
+		}, self.options.delay );
+	},
+
 	search: function( value, event ) {
 		value = value != null ? value : this._value();