Merge branch 'master' into widget-factory-demo

21 files changed, 278 insertions, 176 deletions

diff --git a/ui/jquery.effects.blind.js b/ui/jquery.effects.blind.js
index 7a59d8a75..8ef544faa 100644
--- a/ui/jquery.effects.blind.js
+++ b/ui/jquery.effects.blind.js
@@ -31,7 +31,12 @@ $.effects.effect.blind = function( o ) {
 			animation = {},
 			wrapper, distance;
 
-		$.effects.save( el, props ); 
+		// if already wrapped, the wrapper's properties are my property. #6245
+		if ( el.parent().is( ".ui-effects-wrapper" ) ) {
+			$.effects.save( el.parent(), props );
+		} else {
+			$.effects.save( el, props );
+		}
 		el.show(); 
 		wrapper = $.effects.createWrapper( el ).css({ 
 			overflow: "hidden"
diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js
index b5c49ce7c..00f0151af 100644
--- a/ui/jquery.effects.scale.js
+++ b/ui/jquery.effects.scale.js
@@ -54,7 +54,9 @@ $.effects.effect.scale = function( o ) {
 			origin = o.origin,
 			original = { 
 				height: el.height(), 
-				width: el.width()
+				width: el.width(),
+				outerHeight: el.outerHeight(),
+				outerWidth: el.outerWidth()
 			},
 			factor = {
 				y: direction != 'horizontal' ? (percent / 100) : 1,
@@ -74,7 +76,9 @@ $.effects.effect.scale = function( o ) {
 		options.from = o.from || ( mode == 'show' ? { height: 0, width: 0 } : original ); 
 		options.to = {
 			height: original.height * factor.y, 
-			width: original.width * factor.x
+			width: original.width * factor.x,
+			outerHeight: original.outerHeight * factor.y, 
+			outerWidth: original.outerWidth * factor.x
 		}; 
 
 		if ( options.fade ) { // Fade option to support puff
@@ -122,21 +126,14 @@ $.effects.effect.size = function( o ) {
 		}
 		original = {
 			height: el.height(), 
-			width: el.width()
+			width: el.width(),
+			outerHeight: el.outerHeight(),
+			outerWidth: el.outerWidth()
 		};
 
 		el.from = o.from || original;
 		el.to = o.to || original;
 
-		// Adjust
-		if (origin) { // Calculate baseline shifts
-			baseline = $.effects.getBaseline( origin, original );
-			el.from.top = ( original.height - el.from.height ) * baseline.y;
-			el.from.left = ( original.width - el.from.width ) * baseline.x;
-			el.to.top = ( original.height - el.to.height ) * baseline.y;
-			el.to.left = ( original.width - el.to.width ) * baseline.x;
-		}
-
 		// Set scaling factor
 		factor = {
 			from: {
@@ -183,6 +180,16 @@ $.effects.effect.size = function( o ) {
 		$.effects.createWrapper( el );
 		el.css( 'overflow', 'hidden' ).css( el.from ); 
 
+		// Adjust
+		if (origin) { // Calculate baseline shifts
+			baseline = $.effects.getBaseline( origin, original );
+			el.from.top = ( original.outerHeight - el.outerHeight() ) * baseline.y;
+			el.from.left = ( original.outerWidth - el.outerWidth() ) * baseline.x;
+			el.to.top = ( original.outerHeight - el.to.outerHeight ) * baseline.y;
+			el.to.left = ( original.outerWidth - el.to.outerWidth ) * baseline.x;
+		}
+		el.css( el.from ); // set top & left
+
 		// Animate
 		if ( scale == 'content' || scale == 'both' ) { // Scale the children
 
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index c6b33befb..7602ae9bc 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -15,6 +15,7 @@
 
 // TODO: use ui-accordion-header-active class and fix styling
 $.widget( "ui.accordion", {
+	version: "@VERSION",
 	options: {
 		active: 0,
 		animated: "slide",
@@ -432,7 +433,6 @@ $.widget( "ui.accordion", {
 });
 
 $.extend( $.ui.accordion, {
-	version: "@VERSION",
 	animations: {
 		slide: function( options, additions ) {
 			var showOverflow = options.toShow.css( "overflow" ),
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index f6573174a..e39b4649e 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -19,6 +19,7 @@
 var requestIndex = 0;
 
 $.widget( "ui.autocomplete", {
+	version: "@VERSION",
 	defaultElement: "<input>",
 	options: {
 		appendTo: "body",
@@ -63,7 +64,7 @@ $.widget( "ui.autocomplete", {
 			})
 			.bind( "keydown.autocomplete", function( event ) {
 				if ( self.options.disabled || self.element.attr( "readonly" ) ) {
-                    suppressKeyPress = true;
+					suppressKeyPress = true;
 					suppressInput = true;
 					return;
 				}
@@ -73,21 +74,21 @@ $.widget( "ui.autocomplete", {
 				var keyCode = $.ui.keyCode;
 				switch( event.keyCode ) {
 				case keyCode.PAGE_UP:
-                    suppressKeyPress = true;
+					suppressKeyPress = true;
 					self._move( "previousPage", event );
 					break;
 				case keyCode.PAGE_DOWN:
-                    suppressKeyPress = true;
+					suppressKeyPress = true;
 					self._move( "nextPage", event );
 					break;
 				case keyCode.UP:
-                    suppressKeyPress = true;
+					suppressKeyPress = true;
 					self._move( "previous", event );
 					// prevent moving cursor to beginning of text field in some browsers
 					event.preventDefault();
 					break;
 				case keyCode.DOWN:
-                    suppressKeyPress = true;
+					suppressKeyPress = true;
 					self._move( "next", event );
 					// prevent moving cursor to end of text field in some browsers
 					event.preventDefault();
@@ -122,7 +123,7 @@ $.widget( "ui.autocomplete", {
 				if ( suppressKeyPress ) {
 					suppressKeyPress = false;
 					event.preventDefault();
-                    return;
+					return;
 				}
 
 				// replicate some key handlers to allow them to repeat in Firefox and Opera
@@ -144,7 +145,7 @@ $.widget( "ui.autocomplete", {
 					// prevent moving cursor to end of text field in some browsers
 					event.preventDefault();
 					break;
-                }
+				}
 			})
 			.bind( "input.autocomplete", function(event) {
 				if ( suppressInput ) {
@@ -475,7 +476,6 @@ $.widget( "ui.autocomplete", {
 });
 
 $.extend( $.ui.autocomplete, {
-	version: "@VERSION",
 	escapeRegex: function( value ) {
 		return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
 	},
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index a95dddc6c..482cdc24c 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -41,6 +41,7 @@ var lastActive, startXPos, startYPos, clickDragged,
 	};
 
 $.widget( "ui.button", {
+	version: "@VERSION",
 	defaultElement: "<button>",
 	options: {
 		disabled: null,
@@ -95,19 +96,22 @@ $.widget( "ui.button", {
 				}
 				$( this ).removeClass( hoverClass );
 			})
-			.bind( "focus.button", function() {
-				// no need to check disabled, focus won't be triggered anyway
-				$( this ).addClass( focusClass );
-			})
-			.bind( "blur.button", function() {
-				$( this ).removeClass( focusClass );
-			})
 			.bind( "click.button", function( event ) {
 				if ( options.disabled ) {
+					event.preventDefault();
 					event.stopImmediatePropagation();
 				}
 			});
 
+		this.element
+			.bind( "focus.button", function() {
+				// no need to check disabled, focus won't be triggered anyway
+				self.buttonElement.addClass( focusClass );
+			})
+			.bind( "blur.button", function() {
+				self.buttonElement.removeClass( focusClass );
+			});
+
 		if ( toggleButton ) {
 			this.element.bind( "change.button", function() {
 				if ( clickDragged ) {
@@ -409,6 +413,4 @@ $.widget( "ui.buttonset", {
 	}
 });
 
-$.ui.buttonset.version = "@VERSION";
-
 }( jQuery ) );
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index dc2849155..0eba39842 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -36,6 +36,7 @@ var uiDialogClasses = "ui-dialog ui-widget ui-widget-content ui-corner-all ",
 	};
 
 $.widget("ui.dialog", {
+	version: "@VERSION",
 	options: {
 		autoOpen: true,
 		buttons: {},
@@ -190,6 +191,10 @@ $.widget("ui.dialog", {
 	},
 
 	close: function( event ) {
+		if ( !this._isOpen ) {
+			return self;
+		}
+
 		var self = this,
 			maxZ, thisZ;
 		
@@ -197,13 +202,13 @@ $.widget("ui.dialog", {
 			return;
 		}
 
+		self._isOpen = false;
+
 		if ( self.overlay ) {
 			self.overlay.destroy();
 		}
 		self.uiDialog.unbind( "keypress.ui-dialog" );
 
-		self._isOpen = false;
-
 		if ( self.options.hide ) {
 			self.uiDialog.hide( self.options.hide, function() {
 				self._trigger( "close", event );
@@ -369,8 +374,7 @@ $.widget("ui.dialog", {
 	_makeDraggable: function() {
 		var self = this,
 			options = self.options,
-			doc = $( document ),
-			heightBeforeDrag;
+			doc = $( document );
 
 		function filteredUi( ui ) {
 			return {
@@ -384,9 +388,7 @@ $.widget("ui.dialog", {
 			handle: ".ui-dialog-titlebar",
 			containment: "document",
 			start: function( event, ui ) {
-				heightBeforeDrag = options.height === "auto" ? "auto" : $( this ).height();
 				$( this )
-					.height( $( this ).height() )
 					.addClass( "ui-dialog-dragging" );
 				self._trigger( "dragStart", event, filteredUi( ui ) );
 			},
@@ -399,8 +401,7 @@ $.widget("ui.dialog", {
 					ui.position.top - doc.scrollTop()
 				];
 				$( this )
-					.removeClass( "ui-dialog-dragging" )
-					.height( heightBeforeDrag );
+					.removeClass( "ui-dialog-dragging" );
 				self._trigger( "dragStop", event, filteredUi( ui ) );
 				$.ui.dialog.overlay.resize();
 			}
@@ -655,8 +656,6 @@ $.widget("ui.dialog", {
 });
 
 $.extend($.ui.dialog, {
-	version: "@VERSION",
-
 	uuid: 0,
 	maxZ: 0,
 
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index c16833eb0..6475ebd61 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.draggable", $.ui.mouse, {
+	version: "@VERSION",
 	widgetEventPrefix: "drag",
 	options: {
 		addClasses: true,
@@ -163,6 +164,10 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 		this.helper.addClass("ui-draggable-dragging");
 		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		
+		//If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
+		if ( $.ui.ddmanager ) $.ui.ddmanager.dragStart(this, event);
+		
 		return true;
 	},
 
@@ -229,6 +234,9 @@ $.widget("ui.draggable", $.ui.mouse, {
 			}); //Remove frame helpers
 		}
 		
+		//If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
+		if( $.ui.ddmanager ) $.ui.ddmanager.dragStop(this, event);
+		
 		return $.ui.mouse.prototype._mouseUp.call(this, event);
 	},
 	
@@ -495,10 +503,6 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.draggable, {
-	version: "@VERSION"
-});
-
 $.ui.plugin.add("draggable", "connectToSortable", {
 	start: function(event, ui) {
 
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index b8a93cd46..3942c6b8f 100644
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -16,6 +16,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.droppable", {
+	version: "@VERSION",
 	widgetEventPrefix: "drop",
 	options: {
 		accept: '*',
@@ -146,10 +147,6 @@ $.widget("ui.droppable", {
 
 });
 
-$.extend($.ui.droppable, {
-	version: "@VERSION"
-});
-
 $.ui.intersect = function(draggable, droppable, toleranceMode) {
 
 	if (!droppable.offset) return false;
@@ -238,6 +235,12 @@ $.ui.ddmanager = {
 		return dropped;
 
 	},
+	dragStart: function( draggable, event ) {
+		//Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
+		draggable.element.parentsUntil( "body" ).bind( "scroll.droppable", function() {
+			if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
+		});
+	},
 	drag: function(draggable, event) {
 
 		//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
@@ -279,6 +282,11 @@ $.ui.ddmanager = {
 			}
 		});
 
+	},
+	dragStop: function( draggable, event ) {
+		draggable.element.parentsUntil( "body" ).unbind( "scroll.droppable" );
+		//Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
+		if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
 	}
 };
 
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 41b2e7a1a..03e14f124 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -16,6 +16,7 @@
 var idIncrement = 0;
 
 $.widget("ui.menu", {
+	version: "@VERSION",
 	defaultElement: "<ul>",
 	delay: 150,
 	options: {
@@ -420,6 +421,4 @@ $.widget("ui.menu", {
 	}
 });
 
-$.ui.menu.version = "@VERSION";
-
 }( jQuery ));
diff --git a/ui/jquery.ui.menubar.js b/ui/jquery.ui.menubar.js
index 2879d079c..a0e9afb3c 100644
--- a/ui/jquery.ui.menubar.js
+++ b/ui/jquery.ui.menubar.js
@@ -18,10 +18,11 @@
 // TODO when mixing clicking menus and keyboard navigation, focus handling is broken
 // there has to be just one item that has tabindex
 $.widget( "ui.menubar", {
-   options: {
-      buttons: false,
-      menuIcon: false
-   },
+	version: "@VERSION",
+	options: {
+		buttons: false,
+		menuIcon: false
+	},
 	_create: function() {
 		var that = this;
 		var items = this.items = this.element.children( "li" )
@@ -68,13 +69,13 @@ $.widget( "ui.menubar", {
 			var input = $(this),
 				// TODO menu var is only used on two places, doesn't quite justify the .each
 				menu = input.next( "ul" );
-			
+
 			input.bind( "click.menubar focus.menubar mouseenter.menubar", function( event ) {
 				// ignore triggered focus event
 				if ( event.type == "focus" && !event.originalEvent ) {
 					return;
 				}
-   				event.preventDefault();
+				event.preventDefault();
 				// TODO can we simplify or extractthis check? especially the last two expressions
 				// there's a similar active[0] == menu[0] check in _open
 				if ( event.type == "click" && menu.is( ":visible" ) && that.active && that.active[0] == menu[0] ) {
@@ -84,7 +85,7 @@ $.widget( "ui.menubar", {
 				if ( ( that.open && event.type == "mouseenter" ) || event.type == "click" ) {
 					that._open( event, menu );
 				}
-   			})
+			})
 			.bind( "keydown", function( event ) {
 				switch ( event.keyCode ) {
 				case $.ui.keyCode.SPACE:
@@ -113,11 +114,11 @@ $.widget( "ui.menubar", {
 				input.addClass( "ui-state-default" ).append( "<span class='ui-button-icon-secondary ui-icon ui-icon-triangle-1-s'></span>" );
 				input.removeClass( "ui-button-text-only" ).addClass( "ui-button-text-icon-secondary" );
 			}
-   			
+
 			if ( !that.options.buttons ) {
 				// TODO ui-menubar-link is added above, not needed here?
 				input.addClass( "ui-menubar-link" ).removeClass( "ui-state-default" );
-			};			
+			};
 			
 		});
 		that._bind( {
@@ -139,18 +140,18 @@ $.widget( "ui.menubar", {
 			}
 		});
 	},
-	
+
 	_destroy : function() {
 		var items = this.element.children( "li" )
 			.removeClass( "ui-menubar-item" )
 			.removeAttr( "role", "presentation" )
 			.children( "button, a" );
-		
+
 		this.element
 			.removeClass( "ui-menubar ui-widget-header ui-helper-clearfix" )
 			.removeAttr( "role", "menubar" )
 			.unbind( ".menubar" );
-		
+
 		items
 			.unbind( ".menubar" )
 			.removeClass( "ui-button ui-widget ui-button-text-only ui-menubar-link ui-state-default" )
@@ -172,7 +173,7 @@ $.widget( "ui.menubar", {
 			.removeAttr( "tabindex" )
 			.unbind( ".menubar" );
 	},
-	
+
 	_close: function() {
 		if ( !this.active || !this.active.length )
 			return;
@@ -188,7 +189,7 @@ $.widget( "ui.menubar", {
 		this.active = null;
 		this.open = false;
 	},
-	
+
 	_open: function( event, menu ) {
 		// on a single-button menubar, ignore reopening the same menu
 		if ( this.active && this.active[0] == menu[0] ) {
@@ -222,7 +223,7 @@ $.widget( "ui.menubar", {
 			.focusin();
 		this.open = true;
 	},
-	
+
 	// TODO refactor this and the next three methods
 	_prev: function( event, button ) {
 		button.attr( "tabIndex", -1 );
@@ -234,7 +235,7 @@ $.widget( "ui.menubar", {
 			lastItem.removeAttr( "tabIndex" )[0].focus();
 		}
 	},
-	
+
 	_next: function( event, button ) {
 		button.attr( "tabIndex", -1 );
 		var next = button.parent().nextAll( "li" ).children( ".ui-button" ).eq( 0 );
@@ -256,7 +257,7 @@ $.widget( "ui.menubar", {
 			this._open( event, lastItem );
 		}
 	},
-	
+
 	// TODO rename to child (or something like that)
 	_right: function( event ) {
 		var next = this.active.parent().nextAll( "li:eq(0)" ).children( ".ui-menu" ).eq( 0 );
diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index 0bd38db85..582eaf9c0 100644
--- a/ui/jquery.ui.mouse.js
+++ b/ui/jquery.ui.mouse.js
@@ -18,6 +18,7 @@ $(document).mousedown(function(e) {
 });
 
 $.widget("ui.mouse", {
+	version: "@VERSION",
 	options: {
 		cancel: ':input,option',
 		distance: 1,
@@ -58,7 +59,7 @@ $.widget("ui.mouse", {
 
 		var self = this,
 			btnIsLeft = (event.which == 1),
-			elIsCancel = (typeof this.options.cancel == "string" ? $(event.target).parents().add(event.target).filter(this.options.cancel).length : false);
+			elIsCancel = (typeof this.options.cancel == "string" ? $(event.target).closest(this.options.cancel).length : false);
 		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
 			return true;
 		}
diff --git a/ui/jquery.ui.popup.js b/ui/jquery.ui.popup.js
index 10361a35c..c90755fbb 100644
--- a/ui/jquery.ui.popup.js
+++ b/ui/jquery.ui.popup.js
@@ -17,6 +17,7 @@
 var idIncrement = 0;
 
 $.widget( "ui.popup", {
+	version: "@VERSION",
 	options: {
 		position: {
 			my: "left top",
diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js
index e3b25cfd7..187470681 100644
--- a/ui/jquery.ui.progressbar.js
+++ b/ui/jquery.ui.progressbar.js
@@ -14,6 +14,7 @@
 (function( $, undefined ) {
 
 $.widget( "ui.progressbar", {
+	version: "@VERSION",
 	options: {
 		value: 0,
 		max: 100
@@ -100,8 +101,4 @@ $.widget( "ui.progressbar", {
 	}
 });
 
-$.extend( $.ui.progressbar, {
-	version: "@VERSION"
-});
-
 })( jQuery );
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index e0579ef84..673a8fd75 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.resizable", $.ui.mouse, {
+	version: "@VERSION",
 	widgetEventPrefix: "resize",
 	options: {
 		alsoResize: false,
@@ -293,6 +294,8 @@ $.widget("ui.resizable", $.ui.mouse, {
 		// Calculate the attrs that will be change
 		var data = trigger.apply(this, [event, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
 
+		// Put this in the mouseDrag handler since the user can start pressing shift while resizing
+		this._updateVirtualBoundaries(event.shiftKey);
 		if (this._aspectRatio || event.shiftKey)
 			data = this._updateRatio(data, event);
 
@@ -351,6 +354,32 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 	},
 
+    _updateVirtualBoundaries: function(forceAspectRatio) {
+        var o = this.options, pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b;
+
+        b = {
+            minWidth: isNumber(o.minWidth) ? o.minWidth : 0,
+            maxWidth: isNumber(o.maxWidth) ? o.maxWidth : Infinity,
+            minHeight: isNumber(o.minHeight) ? o.minHeight : 0,
+            maxHeight: isNumber(o.maxHeight) ? o.maxHeight : Infinity
+        };
+
+        if(this._aspectRatio || forceAspectRatio) {
+            // We want to create an enclosing box whose aspect ration is the requested one
+            // First, compute the "projected" size for each dimension based on the aspect ratio and other dimension
+            pMinWidth = b.minHeight * this.aspectRatio;
+            pMinHeight = b.minWidth / this.aspectRatio;
+            pMaxWidth = b.maxHeight * this.aspectRatio;
+            pMaxHeight = b.maxWidth / this.aspectRatio;
+
+            if(pMinWidth > b.minWidth) b.minWidth = pMinWidth;
+            if(pMinHeight > b.minHeight) b.minHeight = pMinHeight;
+            if(pMaxWidth < b.maxWidth) b.maxWidth = pMaxWidth;
+            if(pMaxHeight < b.maxHeight) b.maxHeight = pMaxHeight;
+        }
+        this._vBoundaries = b;
+    },
+
 	_updateCache: function(data) {
 		var o = this.options;
 		this.offset = this.helper.offset();
@@ -364,8 +393,8 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 		var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
 
-		if (data.height) data.width = (csize.height * this.aspectRatio);
-		else if (data.width) data.height = (csize.width / this.aspectRatio);
+		if (isNumber(data.height)) data.width = (data.height * this.aspectRatio);
+		else if (isNumber(data.width)) data.height = (data.width / this.aspectRatio);
 
 		if (a == 'sw') {
 			data.left = cpos.left + (csize.width - data.width);
@@ -381,7 +410,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 	_respectSize: function(data, event) {
 
-		var el = this.helper, o = this.options, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
+		var el = this.helper, o = this._vBoundaries, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
 				ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
 					isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height);
 
@@ -520,10 +549,6 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.resizable, {
-	version: "@VERSION"
-});
-
 /*
  * Resizable Extensions
  */
diff --git a/ui/jquery.ui.selectable.js b/ui/jquery.ui.selectable.js
index fa7d01122..75f1cee66 100644
--- a/ui/jquery.ui.selectable.js
+++ b/ui/jquery.ui.selectable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.selectable", $.ui.mouse, {
+	version: "@VERSION",
 	options: {
 		appendTo: 'body',
 		autoRefresh: true,
@@ -259,8 +260,4 @@ $.widget("ui.selectable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.selectable, {
-	version: "@VERSION"
-});
-
 })(jQuery);
diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index f0b01d7c0..978155370 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -19,7 +19,7 @@
 var numPages = 5;
 
 $.widget( "ui.slider", $.ui.mouse, {
-
+	version: "@VERSION",
 	widgetEventPrefix: "slide",
 
 	options: {
@@ -659,8 +659,4 @@ $.widget( "ui.slider", $.ui.mouse, {
 
 });
 
-$.extend( $.ui.slider, {
-	version: "@VERSION"
-});
-
 }(jQuery));
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 78349669a..99798a915 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.sortable", $.ui.mouse, {
+	version: "@VERSION",
 	widgetEventPrefix: "sort",
 	options: {
 		appendTo: "parent",
@@ -983,7 +984,7 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 		// We first have to update the dom position of the actual currentItem
 		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
-		if(!this._noFinalSort && this.currentItem[0].parentNode) this.placeholder.before(this.currentItem);
+		if(!this._noFinalSort && this.currentItem.parent().length) this.placeholder.before(this.currentItem);
 		this._noFinalSort = null;
 
 		if(this.helper[0] == this.currentItem[0]) {
@@ -1069,8 +1070,4 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.sortable, {
-	version: "@VERSION"
-});
-
 })(jQuery);
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index 2709175b5..b4cefc982 100644
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -14,13 +14,14 @@
 (function( $ ) {
 
 $.widget( "ui.spinner", {
+	version: "@VERSION",
 	defaultElement: "<input>",
 	widgetEventPrefix: "spin",
 	options: {
 		incremental: true,
 		max: null,
 		min: null,
-		numberformat: null,
+		numberFormat: null,
 		page: 10,
 		step: null,
 		value: null
@@ -62,6 +63,7 @@ $.widget( "ui.spinner", {
 				// add buttons
 				.append( self._buttonHtml() )
 				// add behaviours
+				.disableSelection()
 				// TODO: user ._hoverable
 				.hover(function() {
 					if ( !options.disabled ) {
@@ -251,7 +253,7 @@ $.widget( "ui.spinner", {
 			this.counter > 20
 				? this.counter > 100
 					? this.counter > 200
-						? 100 
+						? 100
 						: 10
 					: 2
 				: 1);
@@ -318,13 +320,13 @@ $.widget( "ui.spinner", {
 
 	_parse: function( val ) {
 		if ( typeof val === "string" ) {
-			val = $.global && this.options.numberformat ? $.global.parseFloat( val ) : +val;
+			val = $.global && this.options.numberFormat ? $.global.parseFloat( val ) : +val;
 		}
 		return isNaN( val ) ? null : val;
 	},
 
 	_format: function( num ) {
-		this.element.val( $.global && this.options.numberformat ? $.global.format( num, this.options.numberformat ) : num );
+		this.element.val( $.global && this.options.numberFormat ? $.global.format( num, this.options.numberFormat ) : num );
 	},
 
 	destroy: function() {
@@ -368,6 +370,4 @@ $.widget( "ui.spinner", {
 	}
 });
 
-$.ui.spinner.version = "@VERSION";
-
 }( jQuery ) );
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 239805b14..515a93ae0 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -19,6 +19,7 @@ function getNextTabId() {
 }
 
 $.widget( "ui.tabs", {
+	version: "@VERSION",
 	options: {
 		active: null,
 		collapsible: false,
@@ -577,10 +578,6 @@ $.widget( "ui.tabs", {
 	}
 });
 
-$.extend( $.ui.tabs, {
-	version: "@VERSION"
-});
-
 // DEPRECATED
 if ( $.uiBackCompat !== false ) {
 
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index a8a44f1c0..d30e49c66 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -12,136 +12,202 @@
  *	jquery.ui.widget.js
  *	jquery.ui.position.js
  */
-(function($) {
+(function( $ ) {
 
 var increments = 0;
 
-$.widget("ui.tooltip", {
+$.widget( "ui.tooltip", {
+	version: "@VERSION",
 	options: {
-		tooltipClass: null,
-		items: "[title]",
 		content: function() {
 			return $( this ).attr( "title" );
 		},
+		items: "[title]",
 		position: {
 			my: "left+15 center",
-			at: "right center"
-		}
+			at: "right center",
+			collision: "flip fit"
+		},
+		tooltipClass: null
 	},
+
 	_create: function() {
-		this._bind( {
+		this._bind({
 			mouseover: "open",
 			focusin: "open"
 		});
+
+		// IDs of generated tooltips, needed for destroy
+		this.tooltips = {};
 	},
-	
-	enable: function() {
-		this.options.disabled = false;
+
+	_setOption: function( key, value ) {
+		if ( key === "disabled" ) {
+			this[ value ? "_disable" : "_enable" ]();
+			this.options[ key ] = value;
+			// disable element style changes
+			return;
+		}
+		this._super( "_setOption", key, value );
+	},
+
+	_disable: function() {
+		var that = this;
+
+		// close open tooltips
+		$.each( this.tooltips, function( id, element ) {
+			var event = $.Event( "blur" );
+			event.target = event.currentTarget = element[0];
+			that.close( event, true );
+		});
+
+		// remove title attributes to prevent native tooltips
+		this.element.find( this.options.items ).andSelf().each(function() {
+			var element = $( this );
+			if ( element.is( "[title]" ) ) {
+				element
+					.data( "tooltip-title", element.attr( "title" ) )
+					.attr( "title", "" );
+			}
+		});
 	},
-	
-	disable: function() {
-		// only set option, disable element style changes
-		this.options.disabled = true;
+
+	_enable: function() {
+		// restore title attributes
+		this.element.find( this.options.items ).andSelf().each(function() {
+			var element = $( this );
+			if ( element.data( "tooltip-title" ) ) {
+				element.attr( "title", element.data( "tooltip-title" ) );
+			}
+		});
 	},
-	
-	open: function(event) {
-		var target = $(event && event.target || this.element).closest(this.options.items);
-		if ( !target.length ) {
+
+	open: function( event ) {
+		var content,
+			that = this,
+			target = $( event ? event.target : this.element )
+				.closest( this.options.items );
+
+		// if aria-describedby exists, then the tooltip is already open
+		if ( !target.length || target.attr( "aria-describedby" ) ) {
 			return;
 		}
-		var self = this;
-		if ( !target.data("tooltip-title") ) {
-			target.data("tooltip-title", target.attr("title"));
+
+		if ( !target.data( "tooltip-title" ) ) {
+			target.data( "tooltip-title", target.attr( "title" ) );
 		}
-		var content = this.options.content.call(target[0], function(response) {
-			// IE may instantly serve a cached response, need to give it a chance to finish with _open before that
+
+		content = this.options.content.call( target[0], function( response ) {
+			// IE may instantly serve a cached response for ajax requests
+			// delay this call to _open so the other call to _open runs first
 			setTimeout(function() {
-				// when undefined, it got removeAttr, then ignore (ajax response)
-				// intially its an empty string, so not undefined
-				// TODO is there a better approach to enable ajax tooltips to have two updates?
-				if (target.attr( "aria-describedby" ) !== undefined) {
-					self._open(event, target, response);
-				}
-			}, 13);
+				that._open( event, target, response );
+			}, 1 );
 		});
-		if (content) {
-			self._open(event, target, content);
+		if ( content ) {
+			that._open( event, target, content );
 		}
 	},
-	
+
 	_open: function( event, target, content ) {
-		if ( !content )
+		if ( !content ) {
 			return;
+		}
 
-		target.attr("title", "");
-
-		if ( this.options.disabled )
-			return;
+		// if we have a title, clear it to prevent the native tooltip
+		// we have to check first to avoid defining a title if none exists
+		// (we don't want to cause an element to start matching [title])
+		// TODO: document why we don't use .removeAttr()
+		if ( target.is( "[title]" ) ) {
+			target.attr( "title", "" );
+		}
 
 		// ajaxy tooltip can update an existing one
 		var tooltip = this._find( target );
-		if (!tooltip.length) {
-			tooltip = this._tooltip();
+		if ( !tooltip.length ) {
+			tooltip = this._tooltip( target );
 			target.attr( "aria-describedby", tooltip.attr( "id" ) );
 		}
-		tooltip.find(".ui-tooltip-content").html( content );
-		tooltip.position( $.extend({
-			of: target
-		}, this.options.position ) ).hide();
+		tooltip.find( ".ui-tooltip-content" ).html( content );
+		tooltip
+			.stop( true )
+			.position( $.extend({
+				of: target,
+				using: function( pos ) {
+					// we only want to hide if there's no custom using defined
+					$( this ).css( pos ).hide();
+				}
+			}, this.options.position ) );
 
-		tooltip.stop( true );
 		this._show( tooltip, this.options.show );
 
 		this._trigger( "open", event );
 
 		this._bind( target, {
 			mouseleave: "close",
-			blur: "close",
-			click: "close"
+			blur: "close"
 		});
 	},
-	
-	close: function( event ) {
-		var target = $( event && event.currentTarget || this.element );
-		target.attr( "title", target.data( "tooltip-title" ) );
-		
-		if ( this.options.disabled )
+
+	close: function( event, force ) {
+		var that = this,
+			target = $( event ? event.currentTarget : this.element ),
+			tooltip = this._find( target );
+
+		// don't close if the element has focus
+		// this prevents the tooltip from closing if you hover while focused
+		if ( !force && document.activeElement === target[0] ) {
 			return;
+		}
+
+		// only set title if we had one before (see comment in _open())
+		if ( target.data( "tooltip-title" ) ) {
+			target.attr( "title", target.data( "tooltip-title" ) );
+		}
 
-		var tooltip = this._find( target );
 		target.removeAttr( "aria-describedby" );
-		
+
 		tooltip.stop( true );
 		this._hide( tooltip, this.options.hide, function() {
 			$( this ).remove();
+			delete that.tooltips[ this.id ];
 		});
-		
+
 		target.unbind( "mouseleave.tooltip blur.tooltip" );
-		
+
 		this._trigger( "close", event );
 	},
 
-	_tooltip: function() {
-		var tooltip = $( "<div></div>" )
-			.attr( "id", "ui-tooltip-" + increments++ )
-			.attr( "role", "tooltip" )
-			.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content" );
-		if (this.options.tooltipClass) {
-			tooltip.addClass(this.options.tooltipClass);
-		}
-		$( "<div></div>" )
+	_tooltip: function( element ) {
+		var id = "ui-tooltip-" + increments++,
+			tooltip = $( "<div>" )
+				.attr({
+					id: id,
+					role: "tooltip"
+				})
+				.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content " +
+					( this.options.tooltipClass || "" ) );
+		$( "<div>" )
 			.addClass( "ui-tooltip-content" )
 			.appendTo( tooltip );
 		tooltip.appendTo( document.body );
+		if ( $.fn.bgiframe ) {
+			tooltip.bgiframe();
+		}
+		this.tooltips[ id ] = element;
 		return tooltip;
 	},
 
 	_find: function( target ) {
 		var id = target.attr( "aria-describedby" );
-		return id ? $( document.getElementById( id ) ) : $();
+		return id ? $( "#" + id ) : $();
+	},
+
+	_destroy: function() {
+		$.each( this.tooltips, function( id ) {
+			$( "#" + id ).remove();
+		});
 	}
 });
 
-$.ui.tooltip.version = "@VERSION";
-
-})(jQuery);
\ No newline at end of file
+}( jQuery ) );
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index 4167fd4e5..da52a5a9c 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -49,7 +49,7 @@ $.widget = function( name, base, prototype ) {
 		if ( arguments.length ) {
 			this._createWidget( options, element );
 		}
-	}, $[ namespace ][ name ] );
+	}, $[ namespace ][ name ], { version: prototype.version } );
 
 	var basePrototype = new base();
 	// we need to make the options hash a property directly on the new instance
@@ -379,7 +379,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
 		var hasOptions = !$.isEmptyObject( options ),
 			effectName = options.effect || defaultEffect;
 		options.complete = callback;
-		if (options.delay) {
+		if ( options.delay ) {
 			element.delay( options.delay );
 		}
 		if ( hasOptions && $.effects && ( $.effects.effect[ effectName ] || $.uiBackCompat !== false && $.effects[ effectName ] ) ) {