From 5dad57e3c2001b6c644e3c39798198bc34fa1e5d Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 12 Nov 2010 10:28:55 -0500
Subject: Buttonset: Added items option and removed visible filter for adding
 rounded corners. Fixes #6262 - buttonset not applying ui-corner to invisible
 elements.

---
 ui/jquery.ui.button.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 912e45273..78134e308 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -315,6 +315,10 @@ $.widget( "ui.button", {
 });
 
 $.widget( "ui.buttonset", {
+	options: {
+		items: ":button, :submit, :reset, :checkbox, :radio, a, :data(button)"
+	},
+
 	_create: function() {
 		this.element.addClass( "ui-buttonset" );
 	},
@@ -332,7 +336,7 @@ $.widget( "ui.buttonset", {
 	},
 	
 	refresh: function() {
-		this.buttons = this.element.find( ":button, :submit, :reset, :checkbox, :radio, a, :data(button)" )
+		this.buttons = this.element.find( this.options.items )
 			.filter( ":ui-button" )
 				.button( "refresh" )
 			.end()
@@ -343,13 +347,11 @@ $.widget( "ui.buttonset", {
 				return $( this ).button( "widget" )[ 0 ];
 			})
 				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
-				.filter( ":visible" )
-					.filter( ":first" )
-						.addClass( "ui-corner-left" )
-					.end()
-					.filter( ":last" )
-						.addClass( "ui-corner-right" )
-					.end()
+				.filter( ":first" )
+					.addClass( "ui-corner-left" )
+				.end()
+				.filter( ":last" )
+					.addClass( "ui-corner-right" )
 				.end()
 			.end();
 	},
-- 
cgit v1.2.3


From c2139fc2e6c7ef3176ecc01d427188b3752392ef Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 12 Nov 2010 12:57:34 -0500
Subject: Dialog: Added some missing semicolons.

---
 ui/jquery.ui.dialog.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index efc445693..ad9c183ce 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -586,7 +586,7 @@ $.widget("ui.dialog", {
 				}
 				break;
 			case "draggable":
-				var isDraggable = uiDialog.is( ":data(draggable)" )
+				var isDraggable = uiDialog.is( ":data(draggable)" );
 				if ( isDraggable && !value ) {
 					uiDialog.draggable( "destroy" );
 				}
@@ -600,7 +600,7 @@ $.widget("ui.dialog", {
 				break;
 			case "resizable":
 				// currently resizable, becoming non-resizable
-				var isResizable = uiDialog.is( ":data(resizable)" )
+				var isResizable = uiDialog.is( ":data(resizable)" );
 				if (isResizable && !value) {
 					uiDialog.resizable('destroy');
 				}
-- 
cgit v1.2.3


From 859c87e6d92813c7d99c2ceeaad0ded766c820ea Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 16 Nov 2010 01:57:52 -0600
Subject: Effects: Allow named speeds to be 0. Fixes #6657 - Allow named speeds
 to be 0

---
 ui/jquery.effects.core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index 49ab4e220..111cb6f84 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -432,7 +432,7 @@ function _normalizeArguments(effect, options, speed, callback) {
 
 	speed = speed || options.duration;
 	speed = $.fx.off ? 0 : typeof speed == 'number'
-		? speed : $.fx.speeds[speed] || $.fx.speeds._default;
+		? speed : speed in $.fx.speeds ? $.fx.speeds[speed] : $.fx.speeds._default;
 
 	callback = callback || options.complete;
 
-- 
cgit v1.2.3


From a2e0eb920aaa41e6248e1a2f7d013997ba4f421f Mon Sep 17 00:00:00 2001
From: pheiberg <peter@heiberg.se>
Date: Sat, 13 Nov 2010 22:58:07 +0100
Subject: Datepicker: Fixed parsing of single y character for date formats.
 Fixes #6659 - Datepicker: Date format ymmdd not parsed correctly.

---
 tests/unit/datepicker/datepicker_options.js | 12 +++++++-----
 ui/jquery.ui.datepicker.js                  |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'ui')

diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index b10fd95ae..5b5f252cc 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -777,12 +777,12 @@ test('parseDate', function() {
 		new Date(2001, 12 - 1, 13), 'Parse date d m y');
 	equalsDate($.datepicker.parseDate('dd mm yy', '13 12 2001'),
 		new Date(2001, 12 - 1, 13), 'Parse date dd mm yy');
-	equalsDate($.datepicker.parseDate('y-o', '2001-34'),
+	equalsDate($.datepicker.parseDate('y-o', '01-34'),
 		new Date(2001, 2 - 1, 3), 'Parse date y-o');
 	equalsDate($.datepicker.parseDate('yy-oo', '2001-347'),
-		new Date(2001, 12 - 1, 13), 'Parse date yy oo');
+		new Date(2001, 12 - 1, 13), 'Parse date yy-oo');
 	equalsDate($.datepicker.parseDate('oo yy', '348 2004'),
-		new Date(2004, 12 - 1, 13), 'Parse date oo-yy');
+		new Date(2004, 12 - 1, 13), 'Parse date oo yy');
 	equalsDate($.datepicker.parseDate('D d M y', 'Sat 3 Feb 01'),
 		new Date(2001, 2 - 1, 3), 'Parse date D d M y');
 	equalsDate($.datepicker.parseDate('d MM DD yy', '3 February Saturday 2001'),
@@ -792,6 +792,8 @@ test('parseDate', function() {
 	equalsDate($.datepicker.parseDate('\'day\' d \'of\' MM (\'\'DD\'\'), yy',
 		'day 3 of February (\'Saturday\'), 2001'), new Date(2001, 2 - 1, 3),
 		'Parse date \'day\' d \'of\' MM (\'\'DD\'\'), yy');
+	equalsDate($.datepicker.parseDate('ymmdd', '010203'),
+		new Date(2001, 2 - 1, 3), 'Parse date ymmdd - default cutoff');
 	equalsDate($.datepicker.parseDate('y-m-d', '01-02-03'),
 		new Date(2001, 2 - 1, 3), 'Parse date y-m-d - default cutoff');
 	equalsDate($.datepicker.parseDate('y-m-d', '51-02-03'),
@@ -845,8 +847,8 @@ test('parseDateErrors', function() {
 		'3 2 AD01 - d m y', 'Missing number at position 4');
 	expectError(function() { $.datepicker.parseDate('d m yy', '3 2 AD01'); },
 		'3 2 AD01 - dd mm yy', 'Missing number at position 4');
-	expectError(function() { $.datepicker.parseDate('y-o', '2001-D01'); },
-		'2001-D01 - y-o', 'Missing number at position 5');
+	expectError(function() { $.datepicker.parseDate('y-o', '01-D01'); },
+		'2001-D01 - y-o', 'Missing number at position 3');
 	expectError(function() { $.datepicker.parseDate('yy-oo', '2001-D01'); },
 		'2001-D01 - yy-oo', 'Missing number at position 5');
 	expectError(function() { $.datepicker.parseDate('D d M y', 'D7 3 Feb 01'); },
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 110e9d6f8..961e1780d 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -983,9 +983,9 @@ $.extend(Datepicker.prototype, {
 		};
 		// Extract a number from the string value
 		var getNumber = function(match) {
-			lookAhead(match);
+			var isDoubled = lookAhead(match);
 			var size = (match == '@' ? 14 : (match == '!' ? 20 :
-				(match == 'y' ? 4 : (match == 'o' ? 3 : 2))));
+				(match == 'y' && isDoubled ? 4 : (match == 'o' ? 3 : 2))));
 			var digits = new RegExp('^\\d{1,' + size + '}');
 			var num = value.substring(iValue).match(digits);
 			if (!num)
-- 
cgit v1.2.3


From abfa0e1e951b74548f9441a7ba44325d8c4d55b7 Mon Sep 17 00:00:00 2001
From: Alex Dovenmuehle <adovenmuehle@gmail.com>
Date: Fri, 19 Nov 2010 08:54:11 -0500
Subject: Core: Fixed switchClass queueing issues using lazy evaluation of
 element's style. Fixed #6244 - switchClass queues incorrectly.

---
 ui/jquery.effects.core.js | 56 +++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 24 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index 111cb6f84..9be704128 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -232,33 +232,41 @@ $.effects.animateClass = function(value, duration, easing, callback) {
 	}
 
 	return this.each(function() {
+		$.queue(this, 'fx', function() {
+			var that = $(this),
+				originalStyleAttr = that.attr('style') || ' ',
+				originalStyle = filterStyles(getElementStyles.call(this)),
+				newStyle,
+				className = that.attr('className');
 
-		var that = $(this),
-			originalStyleAttr = that.attr('style') || ' ',
-			originalStyle = filterStyles(getElementStyles.call(this)),
-			newStyle,
-			className = that.attr('className');
-
-		$.each(classAnimationActions, function(i, action) {
-			if (value[action]) {
-				that[action + 'Class'](value[action]);
-			}
-		});
-		newStyle = filterStyles(getElementStyles.call(this));
-		that.attr('className', className);
-
-		that.animate(styleDifference(originalStyle, newStyle), duration, easing, function() {
 			$.each(classAnimationActions, function(i, action) {
-				if (value[action]) { that[action + 'Class'](value[action]); }
+				if (value[action]) {
+					that[action + 'Class'](value[action]);
+				}
 			});
-			// work around bug in IE by clearing the cssText before setting it
-			if (typeof that.attr('style') == 'object') {
-				that.attr('style').cssText = '';
-				that.attr('style').cssText = originalStyleAttr;
-			} else {
-				that.attr('style', originalStyleAttr);
-			}
-			if (callback) { callback.apply(this, arguments); }
+			newStyle = filterStyles(getElementStyles.call(this));
+			that.attr('className', className);
+
+			that.animate(styleDifference(originalStyle, newStyle), duration, easing, function() {
+				$.each(classAnimationActions, function(i, action) {
+					if (value[action]) { that[action + 'Class'](value[action]); }
+				});
+				// work around bug in IE by clearing the cssText before setting it
+				if (typeof that.attr('style') == 'object') {
+					that.attr('style').cssText = '';
+					that.attr('style').cssText = originalStyleAttr;
+				} else {
+					that.attr('style', originalStyleAttr);
+				}
+				if (callback) { callback.apply(this, arguments); }
+			});
+
+			// $.animate adds a function to the end of the queue
+			// but we want it at the front
+			var queue = $.queue(this),
+				anim = queue.splice(queue.length - 1, 1)[0];
+			queue.splice(1, 0, anim);
+			$.dequeue(this);
 		});
 	});
 };
-- 
cgit v1.2.3


From 8bb412dd4a09d66d0f4a5456410a647e3db38bcc Mon Sep 17 00:00:00 2001
From: jamiejag <git@jamiegegerson.com>
Date: Mon, 15 Nov 2010 17:45:19 -0800
Subject: Dialog: Ensure dialogs have a z-index when calculating the max
 z-index. Fixex #5955 - Dialog: Closing UI dialog when z-index is not defined
 in any .ui-dialog class, causes NaN to be used as Z-index, throwing an error.
 Fixes #4652 - Dialog: Event loss in subsequent dialog calls (FF3).

---
 ui/jquery.ui.dialog.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index ad9c183ce..c2d5d3e16 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -228,7 +228,7 @@ $.widget("ui.dialog", {
 
 	close: function(event) {
 		var self = this,
-			maxZ;
+			maxZ, thisZ;
 		
 		if (false === self._trigger('beforeClose', event)) {
 			return;
@@ -257,7 +257,10 @@ $.widget("ui.dialog", {
 			maxZ = 0;
 			$('.ui-dialog').each(function() {
 				if (this !== self.uiDialog[0]) {
-					maxZ = Math.max(maxZ, $(this).css('z-index'));
+					thisZ = $(this).css('z-index');
+					if(!isNaN(thisZ)) {
+						maxZ = Math.max(maxZ, thisZ);
+					}
 				}
 			});
 			$.ui.dialog.maxZ = maxZ;
-- 
cgit v1.2.3


From 0c3e56dd7d82e889ffabc606fd66d47f3e2d27c8 Mon Sep 17 00:00:00 2001
From: skeetergraphics <skeetergraphics@gmail.com>
Date: Fri, 19 Nov 2010 10:35:34 -0500
Subject: Slider: Modified handle and scroll content not to jump twice when
 handle is grabbed and dragged from anywhere other than absolute center. Fixed
 #4467 - Slider: handle jumps a few pixels when clicked.

---
 ui/jquery.ui.slider.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index d90a7940f..ed27ae9c8 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -309,7 +309,9 @@ $.widget( "ui.slider", $.ui.mouse, {
 				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
 		};
 
-		this._slide( event, index, normValue );
+		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
+			this._slide( event, index, normValue );
+		}
 		this._animateOff = true;
 		return true;
 	},
-- 
cgit v1.2.3


From 3361e8fe9d94792c399654312d0ee2cf2c8cfe73 Mon Sep 17 00:00:00 2001
From: Khaled AlHourani <me@khaledalhourani.com>
Date: Sat, 20 Nov 2010 17:20:33 +0200
Subject: Datepicker: modified Arabic day names order. Fixed #6676 -
 ui.datepicker: Arabic Localization miss order

---
 ui/i18n/jquery.ui.datepicker-ar.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'ui')

diff --git a/ui/i18n/jquery.ui.datepicker-ar.js b/ui/i18n/jquery.ui.datepicker-ar.js
index c799b48d8..9e37911c2 100644
--- a/ui/i18n/jquery.ui.datepicker-ar.js
+++ b/ui/i18n/jquery.ui.datepicker-ar.js
@@ -1,6 +1,5 @@
 /* Arabic Translation for jQuery UI date picker plugin. */
-/* Khaled Al Horani -- koko.dw@gmail.com */
-/* خالد الحوراني -- koko.dw@gmail.com */
+/* Khaled Alhourani -- me@khaledalhourani.com */
 /* NOTE: monthNames are the original months names and they are the Arabic names, not the new months name فبراير - يناير and there isn't any Arabic roots for these months */
 jQuery(function($){
 	$.datepicker.regional['ar'] = {
@@ -10,13 +9,13 @@ jQuery(function($){
 		currentText: 'اليوم',
 		monthNames: ['كانون الثاني', 'شباط', 'آذار', 'نيسان', 'آذار', 'حزيران',
 		'تموز', 'آب', 'أيلول',	'تشرين الأول', 'تشرين الثاني', 'كانون الأول'],
-		monthNamesShort: ['1','2','3','4','5','6','7','8','9','10','11','12'],
-		dayNames: ['السبت', 'الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة'],
-		dayNamesShort: ['سبت', 'أحد', 'اثنين', 'ثلاثاء', 'أربعاء', 'خميس', 'جمعة'],
-		dayNamesMin: ['سبت', 'أحد', 'اثنين', 'ثلاثاء', 'أربعاء', 'خميس', 'جمعة'],
+		monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+		dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesMin: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
 		weekHeader: 'أسبوع',
 		dateFormat: 'dd/mm/yy',
-		firstDay: 0,
+		firstDay: 6,
   		isRTL: true,
 		showMonthAfterYear: false,
 		yearSuffix: ''};
-- 
cgit v1.2.3


From d69f2ecb1273f382d83b13c349a8c76b17bee2a6 Mon Sep 17 00:00:00 2001
From: pheiberg <peter@heiberg.se>
Date: Sun, 21 Nov 2010 22:06:23 +0100
Subject: Datepicker: changed setDate not to modify the passed date argument.
 Fixes #6671 - setDate manipulates its argument

---
 tests/unit/datepicker/datepicker_options.js |  4 ++++
 ui/jquery.ui.datepicker.js                  | 32 ++++++++++++++---------------
 2 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'ui')

diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index 5b5f252cc..af561a783 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -470,6 +470,10 @@ test('setDate', function() {
 	equalsDate(inp.datepicker('getDate'), minDate, 'Set date min/max - setDate < min');
 	inp.datepicker('setDate', date2);
 	equalsDate(inp.datepicker('getDate'), maxDate, 'Set date min/max - setDate > max');
+	var dateAndTimeToSet = new Date(2008, 3 - 1, 28, 1, 11, 0);
+	var dateAndTimeClone = new Date(2008, 3 - 1, 28, 1, 11, 0);
+	inp.datepicker('setDate', dateAndTimeToSet);
+	equals(dateAndTimeToSet.getTime(), dateAndTimeClone.getTime(), 'Date object passed should not be changed by setDate');
 });
 
 test('altField', function() {
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 961e1780d..739db1007 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1315,16 +1315,16 @@ $.extend(Datepicker.prototype, {
 			}
 			return new Date(year, month, day);
 		};
-		date = (date == null ? defaultDate : (typeof date == 'string' ? offsetString(date) :
-			(typeof date == 'number' ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : date)));
-		date = (date && date.toString() == 'Invalid Date' ? defaultDate : date);
-		if (date) {
-			date.setHours(0);
-			date.setMinutes(0);
-			date.setSeconds(0);
-			date.setMilliseconds(0);
+		var newDate = (date == null ? defaultDate : (typeof date == 'string' ? offsetString(date) :
+			(typeof date == 'number' ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+		newDate = (newDate && newDate.toString() == 'Invalid Date' ? defaultDate : newDate);
+		if (newDate) {
+			newDate.setHours(0);
+			newDate.setMinutes(0);
+			newDate.setSeconds(0);
+			newDate.setMilliseconds(0);
 		}
-		return this._daylightSavingAdjust(date);
+		return this._daylightSavingAdjust(newDate);
 	},
 
 	/* Handle switch to/from daylight saving.
@@ -1344,10 +1344,10 @@ $.extend(Datepicker.prototype, {
 		var clear = !(date);
 		var origMonth = inst.selectedMonth;
 		var origYear = inst.selectedYear;
-		date = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
-		inst.selectedDay = inst.currentDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = inst.currentMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = inst.currentYear = date.getFullYear();
+		var newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
 		if ((origMonth != inst.selectedMonth || origYear != inst.selectedYear) && !noChange)
 			this._notifyChange(inst);
 		this._adjustInstDate(inst);
@@ -1625,9 +1625,9 @@ $.extend(Datepicker.prototype, {
 	_restrictMinMax: function(inst, date) {
 		var minDate = this._getMinMaxDate(inst, 'min');
 		var maxDate = this._getMinMaxDate(inst, 'max');
-		date = (minDate && date < minDate ? minDate : date);
-		date = (maxDate && date > maxDate ? maxDate : date);
-		return date;
+		var newDate = (minDate && date < minDate ? minDate : date);
+		newDate = (maxDate && newDate > maxDate ? maxDate : newDate);
+		return newDate;
 	},
 
 	/* Notify change of month/year. */
-- 
cgit v1.2.3


From d23fe49ae814f677fedd55cddd97768bddeffa12 Mon Sep 17 00:00:00 2001
From: Marian Rudzynski <mr@impaled.org>
Date: Mon, 22 Nov 2010 08:49:47 -0500
Subject: Progressbar: Added max option. Fixes #6681 - Progressbar: add max
 option.

---
 tests/unit/progressbar/progressbar_defaults.js |  3 ++-
 tests/unit/progressbar/progressbar_events.js   | 13 +++++++++++++
 tests/unit/progressbar/progressbar_options.js  |  8 ++++++++
 ui/jquery.ui.progressbar.js                    | 27 ++++++++++++++++++--------
 4 files changed, 42 insertions(+), 9 deletions(-)

(limited to 'ui')

diff --git a/tests/unit/progressbar/progressbar_defaults.js b/tests/unit/progressbar/progressbar_defaults.js
index b663708ce..925510871 100644
--- a/tests/unit/progressbar/progressbar_defaults.js
+++ b/tests/unit/progressbar/progressbar_defaults.js
@@ -4,7 +4,8 @@
 
 var progressbar_defaults = {
 	disabled: false,
-	value: 0
+	value: 0,
+	max: 100
 };
 
 commonWidgetTests('progressbar', { defaults: progressbar_defaults });
diff --git a/tests/unit/progressbar/progressbar_events.js b/tests/unit/progressbar/progressbar_events.js
index 22b301abe..585c09091 100644
--- a/tests/unit/progressbar/progressbar_events.js
+++ b/tests/unit/progressbar/progressbar_events.js
@@ -5,6 +5,19 @@
 
 module("progressbar: events");
 
+test("create", function() {
+	expect(1);
+	$("#progressbar").progressbar({
+		value: 5,
+		create: function() {
+			same(5, $(this).progressbar("value") );
+		},
+		change: function() {
+			ok(false, 'create() has triggered change()');
+		}
+	})
+});
+
 test("change", function() {
 	expect(1);
 	$("#progressbar").progressbar({
diff --git a/tests/unit/progressbar/progressbar_options.js b/tests/unit/progressbar/progressbar_options.js
index 269f93779..70ad7abab 100644
--- a/tests/unit/progressbar/progressbar_options.js
+++ b/tests/unit/progressbar/progressbar_options.js
@@ -31,4 +31,12 @@ test("{ value : 105 }", function() {
 	same( 100, $("#progressbar").progressbar("value") );
 });
 
+test("{ max : 5, value : 10 }", function() {
+	$("#progressbar").progressbar({
+		max: 5,
+		value: 10
+	});
+	same( 5, $("#progressbar").progressbar("value") );
+});
+
 })(jQuery);
diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js
index 5347e026b..009049d27 100644
--- a/ui/jquery.ui.progressbar.js
+++ b/ui/jquery.ui.progressbar.js
@@ -15,11 +15,11 @@
 
 $.widget( "ui.progressbar", {
 	options: {
-		value: 0
+		value: 0,
+		max: 100
 	},
 
 	min: 0,
-	max: 100,
 
 	_create: function() {
 		this.element
@@ -27,13 +27,14 @@ $.widget( "ui.progressbar", {
 			.attr({
 				role: "progressbar",
 				"aria-valuemin": this.min,
-				"aria-valuemax": this.max,
+				"aria-valuemax": this.options.max,
 				"aria-valuenow": this._value()
 			});
 
 		this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
 			.appendTo( this.element );
 
+		this.oldValue = this._value();
 		this._refreshValue();
 	},
 
@@ -63,8 +64,7 @@ $.widget( "ui.progressbar", {
 		if ( key === "value" ) {
 			this.options.value = value;
 			this._refreshValue();
-			this._trigger( "change" );
-			if ( this._value() === this.max ) {
+			if ( this._value() === this.options.max ) {
 				this._trigger( "complete" );
 			}
 		}
@@ -78,14 +78,25 @@ $.widget( "ui.progressbar", {
 		if ( typeof val !== "number" ) {
 			val = 0;
 		}
-		return Math.min( this.max, Math.max( this.min, val ) );
+		return Math.min( this.options.max, Math.max( this.min, val ) );
+	},
+
+	_percentage: function() {
+		return 100 * this._value() / this.options.max;
 	},
 
 	_refreshValue: function() {
 		var value = this.value();
+		var percentage = this._percentage();
+
+		if ( this.oldValue !== value ) {
+			this.oldValue = value;
+			this._trigger( "change" );
+		}
+
 		this.valueDiv
-			.toggleClass( "ui-corner-right", value === this.max )
-			.width( value + "%" );
+			.toggleClass( "ui-corner-right", value === this.options.max )
+			.width( percentage.toFixed(0) + "%" );
 		this.element.attr( "aria-valuenow", value );
 	}
 });
-- 
cgit v1.2.3


From a4d54b4d7782fbf3483bbfdf92627c34cf97eb46 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 22 Nov 2010 11:40:11 -0500
Subject: Datepicker: Don't use ui-helper-hidden-accessible for initial hiding.

---
 themes/base/jquery.ui.datepicker.css | 2 +-
 ui/jquery.ui.datepicker.js           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/themes/base/jquery.ui.datepicker.css b/themes/base/jquery.ui.datepicker.css
index 9494fed74..f9098e3a7 100644
--- a/themes/base/jquery.ui.datepicker.css
+++ b/themes/base/jquery.ui.datepicker.css
@@ -7,7 +7,7 @@
  *
  * http://docs.jquery.com/UI/Datepicker#theming
  */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
 .ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
 .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
 .ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 739db1007..4ba478903 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -107,7 +107,7 @@ function Datepicker() {
 		autoSize: false // True to size the input for the date format, false to leave as is
 	};
 	$.extend(this._defaults, this.regional['']);
-	this.dpDiv = $('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all ui-helper-hidden-accessible"></div>');
+	this.dpDiv = $('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>');
 }
 
 $.extend(Datepicker.prototype, {
@@ -272,6 +272,7 @@ $.extend(Datepicker.prototype, {
 		this._setDate(inst, this._getDefaultDate(inst), true);
 		this._updateDatepicker(inst);
 		this._updateAlternate(inst);
+		inst.dpDiv.show();
 	},
 
 	/* Pop-up the date picker in a "dialog" box.
-- 
cgit v1.2.3


From 7b523c2ec144fb0f4e39ad1c593453058fd3fb3a Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 22 Nov 2010 11:46:36 -0500
Subject: Datepicker: Handle clearing the date inside _setDate() as early as
 possible. Fixes #6684 - Datepicker: setDate() should accept an empty string.

Thanks RobinHerbots.
---
 ui/jquery.ui.datepicker.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 4ba478903..687ed2b05 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1342,7 +1342,10 @@ $.extend(Datepicker.prototype, {
 
 	/* Set the date(s) directly. */
 	_setDate: function(inst, date, noChange) {
-		var clear = !(date);
+		if ( !date ) {
+			inst.input.val( "" );
+			return;
+		}
 		var origMonth = inst.selectedMonth;
 		var origYear = inst.selectedYear;
 		var newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
@@ -1353,7 +1356,7 @@ $.extend(Datepicker.prototype, {
 			this._notifyChange(inst);
 		this._adjustInstDate(inst);
 		if (inst.input) {
-			inst.input.val(clear ? '' : this._formatDate(inst));
+			inst.input.val(this._formatDate(inst));
 		}
 	},
 
-- 
cgit v1.2.3


From 9ade71071a54fba328a429e608757e8d984b052e Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 22 Nov 2010 12:59:57 -0500
Subject: Datepicker: Proper handling of empty strings for dates.

---
 ui/jquery.ui.datepicker.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 687ed2b05..ed2ab0600 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1316,7 +1316,7 @@ $.extend(Datepicker.prototype, {
 			}
 			return new Date(year, month, day);
 		};
-		var newDate = (date == null ? defaultDate : (typeof date == 'string' ? offsetString(date) :
+		var newDate = (date == null || date === '' ? defaultDate : (typeof date == 'string' ? offsetString(date) :
 			(typeof date == 'number' ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
 		newDate = (newDate && newDate.toString() == 'Invalid Date' ? defaultDate : newDate);
 		if (newDate) {
@@ -1342,10 +1342,7 @@ $.extend(Datepicker.prototype, {
 
 	/* Set the date(s) directly. */
 	_setDate: function(inst, date, noChange) {
-		if ( !date ) {
-			inst.input.val( "" );
-			return;
-		}
+		var clear = !date;
 		var origMonth = inst.selectedMonth;
 		var origYear = inst.selectedYear;
 		var newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
@@ -1356,7 +1353,7 @@ $.extend(Datepicker.prototype, {
 			this._notifyChange(inst);
 		this._adjustInstDate(inst);
 		if (inst.input) {
-			inst.input.val(this._formatDate(inst));
+			inst.input.val(clear ? '' : this._formatDate(inst));
 		}
 	},
 
-- 
cgit v1.2.3


From 98f7e6a8d615772fbddbf185241d087a95e5e121 Mon Sep 17 00:00:00 2001
From: pheiberg <peter@heiberg.se>
Date: Wed, 24 Nov 2010 19:17:23 +0100
Subject: Datepicker: made it possible to select a date in the selected month
 using enter. Fixes #5527 - Datepicker: Problem selecting the date with
 keyboard shorcuts

---
 ui/jquery.ui.datepicker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index ed2ab0600..519b8a913 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -500,8 +500,8 @@ $.extend(Datepicker.prototype, {
 				case 9: $.datepicker._hideDatepicker();
 						handled = false;
 						break; // hide on tab out
-				case 13: var sel = $('td.' + $.datepicker._dayOverClass, inst.dpDiv).
-							add($('td.' + $.datepicker._currentClass, inst.dpDiv));
+				case 13: var sel = $('td.' + $.datepicker._dayOverClass + ':not(.' + 
+									$.datepicker._currentClass + ')', inst.dpDiv);
 						if (sel[0])
 							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
 						else
-- 
cgit v1.2.3


From 40135bb09130a56aabc0d185b62a597cb45df0dc Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 30 Nov 2010 22:19:20 -0500
Subject: Autocomplete: Handle ajax errors and timeouts. Fixes #6692 -
 Autocomplete: ui-autocomplete-loading class not removed when Ajax request
 times out.

---
 ui/jquery.ui.autocomplete.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 80132e2d1..6aefe87d6 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -245,11 +245,22 @@ $.widget( "ui.autocomplete", {
 				if (self.xhr) {
 					self.xhr.abort();
 				}
-				self.xhr = $.getJSON( url, request, function( data, status, xhr ) {
-					if ( xhr === self.xhr ) {
-						response( data );
+				self.xhr = $.ajax({
+					url: url,
+					data: request,
+					dataType: "json",
+					success: function( data, status, xhr ) {
+						if ( xhr === self.xhr ) {
+							response( data );
+						}
+						self.xhr = null;
+					},
+					error: function( xhr ) {
+						if ( xhr === self.xhr ) {
+							response( [] );
+						}
+						self.xhr = null;
 					}
-					self.xhr = null;
 				});
 			};
 		} else {
-- 
cgit v1.2.3


From c667cff22d8ef352b81338e2834379678fb2dd27 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 1 Dec 2010 11:23:06 -0500
Subject: Position: Handle sub-pixel offsets better in Firefox. Fixes #6000 -
 Position: Sometimes positioning is off by 1px in Firefox.

---
 ui/jquery.ui.position.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js
index deacedbcc..9d490d274 100644
--- a/ui/jquery.ui.position.js
+++ b/ui/jquery.ui.position.js
@@ -122,8 +122,8 @@ $.fn.position = function( options ) {
 		}
 
 		// prevent fractions (see #5280)
-		position.left = parseInt( position.left );
-		position.top = parseInt( position.top );
+		position.left = Math.round( position.left );
+		position.top = Math.round( position.top );
 
 		collisionPosition = {
 			left: position.left - marginLeft,
-- 
cgit v1.2.3


From eac910f3157af42c7fcd2230aaff8508974ecc9a Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 1 Dec 2010 11:51:16 -0500
Subject: Autocomplete: Update selectedItem in the asynchronous focus handling
 for IE. Fixes #6709 - Autocomplete: Null ui.item on change event in IE8.

---
 ui/jquery.ui.autocomplete.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui')

diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 6aefe87d6..95e221035 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -177,6 +177,7 @@ $.widget( "ui.autocomplete", {
 						// term synchronously and asynchronously :-(
 						setTimeout(function() {
 							self.previous = previous;
+							self.selectedItem = item;
 						}, 1);
 					}
 
-- 
cgit v1.2.3


From e01664a3820c185636a3fe7099e93e68091d24fd Mon Sep 17 00:00:00 2001
From: Jean-Francois Remy <jfremy@virtuoz.com>
Date: Wed, 1 Dec 2010 15:31:59 -0500
Subject: Draggable: Handle scrolled windows. Fixes #6181 - Draggable: issue
 with containment on position:fixed elements.

---
 ui/jquery.ui.draggable.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 71698a85d..8eeaf6120 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -333,10 +333,10 @@ $.widget("ui.draggable", $.ui.mouse, {
 		var o = this.options;
 		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
 		if(o.containment == 'document' || o.containment == 'window') this.containment = [
-			0 - this.offset.relative.left - this.offset.parent.left,
-			0 - this.offset.relative.top - this.offset.parent.top,
-			$(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
-			($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+			(o.containment == 'document' ? 0 : $(window).scrollLeft()) - this.offset.relative.left - this.offset.parent.left,
+			(o.containment == 'document' ? 0 : $(window).scrollTop()) - this.offset.relative.top - this.offset.parent.top,
+			(o.containment == 'document' ? 0 : $(window).scrollLeft()) + $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+			(o.containment == 'document' ? 0 : $(window).scrollTop()) + ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
 		];
 
 		if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor != Array) {
-- 
cgit v1.2.3


From b9e34f726a89fc9edb3b05d4a53b8081c6c6d80f Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 3 Dec 2010 08:31:06 -0500
Subject: Dialog: Don't hide the dialog in _size if it started visible. Fixes
 #6717 - Dialog: Adding a button makes the dialog disappear in IE6.

---
 ui/jquery.ui.dialog.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index c2d5d3e16..81df1d19b 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -633,7 +633,8 @@ $.widget("ui.dialog", {
 		 */
 		var options = this.options,
 			nonContentHeight,
-			minContentHeight;
+			minContentHeight,
+			isVisible = this.uiDialog.is( ":visible" );
 
 		// reset content sizing
 		this.element.show().css({
@@ -665,7 +666,9 @@ $.widget("ui.dialog", {
 			} else {
 				this.uiDialog.show();
 				var autoHeight = this.element.css( "height", "auto" ).height();
-				this.uiDialog.hide();
+				if ( !isVisible ) {
+					this.uiDialog.hide();
+				}
 				this.element.height( Math.max( autoHeight, minContentHeight ) );
 			}
 		} else {
-- 
cgit v1.2.3


From 51695f82c8c0017d3853b36bdadec5c8253648fb Mon Sep 17 00:00:00 2001
From: dblood <dougblood@gmail.com>
Date: Thu, 2 Dec 2010 14:23:41 -0800
Subject: Datepicker: enabled OSX meta keys to work when constraining input.
 Fixed #5317 - datepicker cmd+a/c/v is not working on MAC OS-X

---
 ui/jquery.ui.datepicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 519b8a913..abcb37067 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -565,7 +565,7 @@ $.extend(Datepicker.prototype, {
 		if ($.datepicker._get(inst, 'constrainInput')) {
 			var chars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat'));
 			var chr = String.fromCharCode(event.charCode == undefined ? event.keyCode : event.charCode);
-			return event.ctrlKey || (chr < ' ' || !chars || chars.indexOf(chr) > -1);
+			return event.ctrlKey || event.metaKey || (chr < ' ' || !chars || chars.indexOf(chr) > -1);
 		}
 	},
 
-- 
cgit v1.2.3


From 0d0969ca2b6ad5c8937313cc3868d8a21335d748 Mon Sep 17 00:00:00 2001
From: poplix <poplix@papuasia.org>
Date: Mon, 6 Dec 2010 10:05:46 -0500
Subject: Slider: Changed _trimAlignValue function to return the correct
 inclusive value between min and max. Fixes #6643 - using range and step
 options makes jquery change min and max.

---
 ui/jquery.ui.slider.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index ed27ae9c8..d3b4744e3 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -585,14 +585,14 @@ $.widget( "ui.slider", $.ui.mouse, {
 	
 	// returns the step-aligned value that val is closest to, between (inclusive) min and max
 	_trimAlignValue: function( val ) {
-		if ( val < this._valueMin() ) {
+		if ( val <= this._valueMin() ) {
 			return this._valueMin();
 		}
-		if ( val > this._valueMax() ) {
+		if ( val >= this._valueMax() ) {
 			return this._valueMax();
 		}
 		var step = ( this.options.step > 0 ) ? this.options.step : 1,
-			valModStep = val % step,
+			valModStep = (val - this._valueMin()) % step;
 			alignValue = val - valModStep;
 
 		if ( Math.abs(valModStep) * 2 >= step ) {
-- 
cgit v1.2.3


From 5f919b2421618fb80e6aa6ac05273c6bd2f153b7 Mon Sep 17 00:00:00 2001
From: Heiko Henning <h.henning@educa.ch>
Date: Tue, 7 Dec 2010 12:33:18 -0500
Subject: Datepicker: Added Rhaeto-Romanic translation. Fixes #6728 -
 Datepicker: Add i18n translation for Rhaeto-Romanic.

---
 ui/i18n/jquery.ui.datepicker-rm.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 ui/i18n/jquery.ui.datepicker-rm.js

(limited to 'ui')

diff --git a/ui/i18n/jquery.ui.datepicker-rm.js b/ui/i18n/jquery.ui.datepicker-rm.js
new file mode 100644
index 000000000..cf03cd4c1
--- /dev/null
+++ b/ui/i18n/jquery.ui.datepicker-rm.js
@@ -0,0 +1,21 @@
+/* Romansh initialisation for the jQuery UI date picker plugin. */
+/* Written by Yvonne Gienal (yvonne.gienal@educa.ch). */
+jQuery(function($){
+	$.datepicker.regional['rm'] = {
+		closeText: 'Serrar',
+		prevText: '&#x3c;Suandant',
+		nextText: 'Precedent&#x3e;',
+		currentText: 'Actual',
+		monthNames: ['Schaner','Favrer','Mars','Avrigl','Matg','Zercladur', 'Fanadur','Avust','Settember','October','November','December'],
+		monthNamesShort: ['Scha','Fev','Mar','Avr','Matg','Zer', 'Fan','Avu','Sett','Oct','Nov','Dec'],
+		dayNames: ['Dumengia','Glindesdi','Mardi','Mesemna','Gievgia','Venderdi','Sonda'],
+		dayNamesShort: ['Dum','Gli','Mar','Mes','Gie','Ven','Som'],
+		dayNamesMin: ['Du','Gl','Ma','Me','Gi','Ve','So'],
+		weekHeader: 'emna',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['rm']);
+});
-- 
cgit v1.2.3


From 63ec1152d810a80596b195301ee3d2cd3d6a1776 Mon Sep 17 00:00:00 2001
From: saks <saksmlz@gmail.com>
Date: Tue, 7 Dec 2010 16:27:56 -0500
Subject: Tabs: Added context to global selectors. Fixed #6710 - tabs module
 uses global selectors instead of local to "this.element" element.

---
 tests/unit/tabs/tabs_tickets.js | 21 +++++++++++++++++++++
 ui/jquery.ui.tabs.js            | 14 +++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)

(limited to 'ui')

diff --git a/tests/unit/tabs/tabs_tickets.js b/tests/unit/tabs/tabs_tickets.js
index fdc2295e9..4a09d59e4 100644
--- a/tests/unit/tabs/tabs_tickets.js
+++ b/tests/unit/tabs/tabs_tickets.js
@@ -91,4 +91,25 @@ asyncTest( "#4581 - title attribute for remote tabs does not support foreign lan
 	});
 });
 
+
+test('#6710 - selectors are global', function() {
+	// http://bugs.jqueryui.com/ticket/6710
+	expect(1);
+
+	var container = $('\
+		<div>\
+			<div id="tabs_6710">\
+			<ul>\
+				<li><a href="#tabs-1_6710">Nunc tincidunt</a></li>\
+				<li><a href="#tabs-2_6710">Proin dolor</a></li>\
+			</ul>\
+			<div id="tabs-1_6710"> <p>first</p> </div>\
+			<div id="tabs-2_6710"> <p>second</p>\
+		</div>\
+	</div>');
+	container.find('#tabs_6710').tabs();
+	ok( container.find('#tabs-2_6710').hasClass('ui-tabs-hide'),  'should find panels and add corresponding classes' );
+});
+
+
 })(jQuery);
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index ad99a99b7..7c615c872 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -126,7 +126,7 @@ $.widget( "ui.tabs", {
 
 			// inline tab
 			if ( fragmentId.test( href ) ) {
-				self.panels = self.panels.add( self._sanitizeSelector( href ) );
+				self.panels = self.panels.add( self.element.find( self._sanitizeSelector( href ) ) );
 			// remote tab
 			// prevent loading the page itself if href is just "#"
 			} else if ( href && href !== "#" ) {
@@ -139,7 +139,7 @@ $.widget( "ui.tabs", {
 
 				var id = self._tabId( a );
 				a.href = "#" + id;
-				var $panel = $( "#" + id );
+				var $panel = self.element.find( "#" + id );
 				if ( !$panel.length ) {
 					$panel = $( o.panelTemplate )
 						.attr( "id", id )
@@ -210,13 +210,13 @@ $.widget( "ui.tabs", {
 			this.lis.removeClass( "ui-tabs-selected ui-state-active" );
 			// check for length avoids error when initializing empty list
 			if ( o.selected >= 0 && this.anchors.length ) {
-				$( self._sanitizeSelector( self.anchors[ o.selected ].hash ) ).removeClass( "ui-tabs-hide" );
+				self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) ).removeClass( "ui-tabs-hide" );
 				this.lis.eq( o.selected ).addClass( "ui-tabs-selected ui-state-active" );
 
 				// seems to be expected behavior that the show callback is fired
 				self.element.queue( "tabs", function() {
 					self._trigger( "show", null,
-						self._ui( self.anchors[ o.selected ], $( self._sanitizeSelector( self.anchors[ o.selected ].hash ) ) ) );
+						self._ui( self.anchors[ o.selected ], self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) ) ) );
 				});
 
 				this.load( o.selected );
@@ -337,7 +337,7 @@ $.widget( "ui.tabs", {
 			var el = this,
 				$li = $(el).closest( "li" ),
 				$hide = self.panels.filter( ":not(.ui-tabs-hide)" ),
-				$show = $( self._sanitizeSelector( el.hash ) );
+				$show = self.element.find( self._sanitizeSelector( el.hash ) );
 
 			// If tab is already selected and not collapsible or tab disabled or
 			// or is already loading or click callback returns false stop here.
@@ -496,7 +496,7 @@ $.widget( "ui.tabs", {
 		$li.addClass( "ui-state-default ui-corner-top" ).data( "destroy.tabs", true );
 
 		// try to find an existing element before creating a new one
-		var $panel = $( "#" + id );
+		var $panel = self.element.find( "#" + id );
 		if ( !$panel.length ) {
 			$panel = $( o.panelTemplate )
 				.attr( "id", id )
@@ -630,7 +630,7 @@ $.widget( "ui.tabs", {
 		this.xhr = $.ajax( $.extend( {}, o.ajaxOptions, {
 			url: url,
 			success: function( r, s ) {
-				$( self._sanitizeSelector( a.hash ) ).html( r );
+				self.element.find( self._sanitizeSelector( a.hash ) ).html( r );
 
 				// take care of tab labels
 				self._cleanup();
-- 
cgit v1.2.3


From 22671ad4f8e3e2e921c27bd2933fa088950abf2f Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 8 Dec 2010 12:36:19 -0500
Subject: Dialog: Moved the default value for the position.of option inside the
 _position() method to avoid a bug in jQuery 1.3.2. Fixes #6030 - ui.dialog
 with jQuery 1.3.2 causes RangeError.

This should be reverted in jQuery UI 1.9.
---
 tests/unit/dialog/dialog_defaults.js | 1 -
 ui/jquery.ui.dialog.js               | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'ui')

diff --git a/tests/unit/dialog/dialog_defaults.js b/tests/unit/dialog/dialog_defaults.js
index 612fd58c8..7c94d3336 100644
--- a/tests/unit/dialog/dialog_defaults.js
+++ b/tests/unit/dialog/dialog_defaults.js
@@ -20,7 +20,6 @@ var dialog_defaults = {
 	position: {
 		my: 'center',
 		at: 'center',
-		of: window,
 		collision: 'fit',
 		using: $.ui.dialog.prototype.options.position.using
 	},
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 81df1d19b..c53169b5b 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -57,7 +57,6 @@ $.widget("ui.dialog", {
 		position: {
 			my: 'center',
 			at: 'center',
-			of: window,
 			collision: 'fit',
 			// ensure that the titlebar is never outside the document
 			using: function(pos) {
@@ -528,7 +527,7 @@ $.widget("ui.dialog", {
 		this.uiDialog
 			// workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781
 			.css({ top: 0, left: 0 })
-			.position(position);
+			.position($.extend({ of: window }, position));
 		if (!isVisible) {
 			this.uiDialog.hide();
 		}
-- 
cgit v1.2.3


From b475ae74dfc72a46b2ed7e988ffad461e76b2ea2 Mon Sep 17 00:00:00 2001
From: Kevin Dalman <development@allpro.net>
Date: Mon, 13 Dec 2010 13:02:31 -0500
Subject: Effects: set right/bottom to 'auto' so effects work with dir=rtl.
 Fixed #6736 - Bug in slide effect when dir=rtl and has position.right.

---
 ui/jquery.effects.blind.js  | 2 +-
 ui/jquery.effects.bounce.js | 2 +-
 ui/jquery.effects.clip.js   | 2 +-
 ui/jquery.effects.core.js   | 2 +-
 ui/jquery.effects.drop.js   | 2 +-
 ui/jquery.effects.fold.js   | 2 +-
 ui/jquery.effects.scale.js  | 4 ++--
 ui/jquery.effects.shake.js  | 2 +-
 ui/jquery.effects.slide.js  | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.effects.blind.js b/ui/jquery.effects.blind.js
index 9dc7067a9..44f398a55 100644
--- a/ui/jquery.effects.blind.js
+++ b/ui/jquery.effects.blind.js
@@ -17,7 +17,7 @@ $.effects.blind = function(o) {
 	return this.queue(function() {
 
 		// Create element
-		var el = $(this), props = ['position','top','left'];
+		var el = $(this), props = ['position','top','bottom','left','right'];
 
 		// Set options
 		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
diff --git a/ui/jquery.effects.bounce.js b/ui/jquery.effects.bounce.js
index b307d4f53..ec4a77ec4 100644
--- a/ui/jquery.effects.bounce.js
+++ b/ui/jquery.effects.bounce.js
@@ -17,7 +17,7 @@ $.effects.bounce = function(o) {
 	return this.queue(function() {
 
 		// Create element
-		var el = $(this), props = ['position','top','left'];
+		var el = $(this), props = ['position','top','bottom','left','right'];
 
 		// Set options
 		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
diff --git a/ui/jquery.effects.clip.js b/ui/jquery.effects.clip.js
index c859205b4..9fa8df94a 100644
--- a/ui/jquery.effects.clip.js
+++ b/ui/jquery.effects.clip.js
@@ -17,7 +17,7 @@ $.effects.clip = function(o) {
 	return this.queue(function() {
 
 		// Create element
-		var el = $(this), props = ['position','top','left','height','width'];
+		var el = $(this), props = ['position','top','bottom','left','right','height','width'];
 
 		// Set options
 		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index 9be704128..b2151d689 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -390,7 +390,7 @@ $.extend($.effects, {
 					props[pos] = 'auto';
 				}
 			});
-			element.css({position: 'relative', top: 0, left: 0 });
+			element.css({position: 'relative', top: 0, left: 0, right: 'auto', bottom: 'auto' });
 		}
 
 		return wrapper.css(props).show();
diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js
index 11f501fc4..941508b2e 100644
--- a/ui/jquery.effects.drop.js
+++ b/ui/jquery.effects.drop.js
@@ -17,7 +17,7 @@ $.effects.drop = function(o) {
 	return this.queue(function() {
 
 		// Create element
-		var el = $(this), props = ['position','top','left','opacity'];
+		var el = $(this), props = ['position','top','bottom','left','right','opacity'];
 
 		// Set options
 		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
diff --git a/ui/jquery.effects.fold.js b/ui/jquery.effects.fold.js
index c9b7b698d..f19ae1bf2 100644
--- a/ui/jquery.effects.fold.js
+++ b/ui/jquery.effects.fold.js
@@ -17,7 +17,7 @@ $.effects.fold = function(o) {
 	return this.queue(function() {
 
 		// Create element
-		var el = $(this), props = ['position','top','left'];
+		var el = $(this), props = ['position','top','bottom','left','right'];
 
 		// Set options
 		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js
index edbffb7c9..d980882db 100644
--- a/ui/jquery.effects.scale.js
+++ b/ui/jquery.effects.scale.js
@@ -84,8 +84,8 @@ $.effects.size = function(o) {
 	return this.queue(function() {
 
 		// Create element
-		var el = $(this), props = ['position','top','left','width','height','overflow','opacity'];
-		var props1 = ['position','top','left','overflow','opacity']; // Always restore
+		var el = $(this), props = ['position','top','bottom','left','right','width','height','overflow','opacity'];
+		var props1 = ['position','top','bottom','left','right','overflow','opacity']; // Always restore
 		var props2 = ['width','height','overflow']; // Copy for children
 		var cProps = ['fontSize'];
 		var vProps = ['borderTopWidth', 'borderBottomWidth', 'paddingTop', 'paddingBottom'];
diff --git a/ui/jquery.effects.shake.js b/ui/jquery.effects.shake.js
index 763789159..b94e5a5ab 100644
--- a/ui/jquery.effects.shake.js
+++ b/ui/jquery.effects.shake.js
@@ -17,7 +17,7 @@ $.effects.shake = function(o) {
 	return this.queue(function() {
 
 		// Create element
-		var el = $(this), props = ['position','top','left'];
+		var el = $(this), props = ['position','top','bottom','left','right'];
 
 		// Set options
 		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
diff --git a/ui/jquery.effects.slide.js b/ui/jquery.effects.slide.js
index 56d8452e1..59f6dc578 100644
--- a/ui/jquery.effects.slide.js
+++ b/ui/jquery.effects.slide.js
@@ -17,7 +17,7 @@ $.effects.slide = function(o) {
 	return this.queue(function() {
 
 		// Create element
-		var el = $(this), props = ['position','top','left'];
+		var el = $(this), props = ['position','top','bottom','left','right'];
 
 		// Set options
 		var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
-- 
cgit v1.2.3


From cba92afe257e51e18ca2bb2161559e8928e82fad Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 14 Dec 2010 09:02:00 -0500
Subject: Effects: Fixed queueing of class animations. Fixes #6748 -
 animateClass broken in 1.8.7.

---
 ui/jquery.effects.core.js | 64 +++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index b2151d689..bb88dcf19 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -231,43 +231,41 @@ $.effects.animateClass = function(value, duration, easing, callback) {
 		easing = null;
 	}
 
-	return this.each(function() {
-		$.queue(this, 'fx', function() {
-			var that = $(this),
-				originalStyleAttr = that.attr('style') || ' ',
-				originalStyle = filterStyles(getElementStyles.call(this)),
-				newStyle,
-				className = that.attr('className');
+	return this.queue('fx', function() {
+		var that = $(this),
+			originalStyleAttr = that.attr('style') || ' ',
+			originalStyle = filterStyles(getElementStyles.call(this)),
+			newStyle,
+			className = that.attr('className');
+
+		$.each(classAnimationActions, function(i, action) {
+			if (value[action]) {
+				that[action + 'Class'](value[action]);
+			}
+		});
+		newStyle = filterStyles(getElementStyles.call(this));
+		that.attr('className', className);
 
+		that.animate(styleDifference(originalStyle, newStyle), duration, easing, function() {
 			$.each(classAnimationActions, function(i, action) {
-				if (value[action]) {
-					that[action + 'Class'](value[action]);
-				}
+				if (value[action]) { that[action + 'Class'](value[action]); }
 			});
-			newStyle = filterStyles(getElementStyles.call(this));
-			that.attr('className', className);
-
-			that.animate(styleDifference(originalStyle, newStyle), duration, easing, function() {
-				$.each(classAnimationActions, function(i, action) {
-					if (value[action]) { that[action + 'Class'](value[action]); }
-				});
-				// work around bug in IE by clearing the cssText before setting it
-				if (typeof that.attr('style') == 'object') {
-					that.attr('style').cssText = '';
-					that.attr('style').cssText = originalStyleAttr;
-				} else {
-					that.attr('style', originalStyleAttr);
-				}
-				if (callback) { callback.apply(this, arguments); }
-			});
-
-			// $.animate adds a function to the end of the queue
-			// but we want it at the front
-			var queue = $.queue(this),
-				anim = queue.splice(queue.length - 1, 1)[0];
-			queue.splice(1, 0, anim);
-			$.dequeue(this);
+			// work around bug in IE by clearing the cssText before setting it
+			if (typeof that.attr('style') == 'object') {
+				that.attr('style').cssText = '';
+				that.attr('style').cssText = originalStyleAttr;
+			} else {
+				that.attr('style', originalStyleAttr);
+			}
+			if (callback) { callback.apply(this, arguments); }
 		});
+
+		// $.animate adds a function to the end of the queue
+		// but we want it at the front
+		var queue = $.queue(this),
+			anim = queue.splice(queue.length - 1, 1)[0];
+		queue.splice(1, 0, anim);
+		$.dequeue(this);
 	});
 };
 
-- 
cgit v1.2.3


From d2a12ff825ebb0e620b25abdbcbaf024881ef537 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 17 Dec 2010 10:48:17 -0500
Subject: Autocomplete: Abort pending ajax requests when disabled and prevent
 handling results when disabled. Fixes #6752 - Menu may still render when
 autocomplete is disabled.

---
 ui/jquery.ui.autocomplete.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 95e221035..84d76ec08 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -229,6 +229,9 @@ $.widget( "ui.autocomplete", {
 		if ( key === "appendTo" ) {
 			this.menu.element.appendTo( $( value || "body", this.element[0].ownerDocument )[0] )
 		}
+		if ( key === "disabled" && value && this.xhr ) {
+			this.xhr.abort();
+		}
 	},
 
 	_initSource: function() {
@@ -243,7 +246,7 @@ $.widget( "ui.autocomplete", {
 		} else if ( typeof this.options.source === "string" ) {
 			url = this.options.source;
 			this.source = function( request, response ) {
-				if (self.xhr) {
+				if ( self.xhr ) {
 					self.xhr.abort();
 				}
 				self.xhr = $.ajax({
@@ -294,7 +297,7 @@ $.widget( "ui.autocomplete", {
 	},
 
 	_response: function( content ) {
-		if ( content && content.length ) {
+		if ( !this.options.disabled && content && content.length ) {
 			content = this._normalize( content );
 			this._suggest( content );
 			this._trigger( "open" );
-- 
cgit v1.2.3


From 2aabc3911c3f9e4ca2bbb48d298ee6e5648b4c12 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 17 Dec 2010 11:15:17 -0500
Subject: Autocomplete: Track pending requests and only remove the loading
 class when the last request completes. Fixes #6761 - Autocomplete: Loading
 class removed when multiple Ajax requests occur.

---
 ui/jquery.ui.autocomplete.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 84d76ec08..76ceb24c0 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -26,6 +26,9 @@ $.widget( "ui.autocomplete", {
 		},
 		source: null
 	},
+
+	pending: 0,
+
 	_create: function() {
 		var self = this,
 			doc = this.element[ 0 ].ownerDocument,
@@ -291,6 +294,7 @@ $.widget( "ui.autocomplete", {
 	},
 
 	_search: function( value ) {
+		this.pending++;
 		this.element.addClass( "ui-autocomplete-loading" );
 
 		this.source( { term: value }, this.response );
@@ -304,7 +308,10 @@ $.widget( "ui.autocomplete", {
 		} else {
 			this.close();
 		}
-		this.element.removeClass( "ui-autocomplete-loading" );
+		this.pending--;
+		if ( !this.pending ) {
+			this.element.removeClass( "ui-autocomplete-loading" );
+		}
 	},
 
 	close: function( event ) {
-- 
cgit v1.2.3


From 238196d9002c86ca8ea15a58a7c8ae6e91d8de0d Mon Sep 17 00:00:00 2001
From: Saji <saji@saji-laptop.(none)>
Date: Sat, 8 Jan 2011 01:39:27 +0530
Subject: Datepicker: Added Malayalam translation. Fixes #6822 - Datepicker:
 Add i18n translation for Malayalam.

---
 ui/i18n/jquery.ui.datepicker-ml.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 ui/i18n/jquery.ui.datepicker-ml.js

(limited to 'ui')

diff --git a/ui/i18n/jquery.ui.datepicker-ml.js b/ui/i18n/jquery.ui.datepicker-ml.js
new file mode 100644
index 000000000..753dba411
--- /dev/null
+++ b/ui/i18n/jquery.ui.datepicker-ml.js
@@ -0,0 +1,23 @@
+/* Malayalam (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Saji Nediyanchath (saji89@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['ml'] = {
+		closeText: 'ശരി',
+		prevText: 'മുന്നത്തെ',  
+		nextText: 'അടുത്തത് ',
+		currentText: 'ഇന്ന്',
+		monthNames: ['ജനുവരി','ഫെബ്രുവരി','മാര്‍ച്ച്','ഏപ്രില്‍','മേയ്','ജൂണ്‍',
+		'ജൂലൈ','ആഗസ്റ്റ്','സെപ്റ്റംബര്‍','ഒക്ടോബര്‍','നവംബര്‍','ഡിസംബര്‍'],
+		monthNamesShort: ['ജനു', 'ഫെബ്', 'മാര്‍', 'ഏപ്രി', 'മേയ്', 'ജൂണ്‍',
+		'ജൂലാ', 'ആഗ', 'സെപ്', 'ഒക്ടോ', 'നവം', 'ഡിസ'],
+		dayNames: ['ഞായര്‍', 'തിങ്കള്‍', 'ചൊവ്വ', 'ബുധന്‍', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
+		dayNamesShort: ['ഞായ', 'തിങ്ക', 'ചൊവ്വ', 'ബുധ', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
+		dayNamesMin: ['ഞാ','തി','ചൊ','ബു','വ്യാ','വെ','ശ'],
+		weekHeader: 'ആ',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ml']);
+});
-- 
cgit v1.2.3


From dd7aae2cc8789316592aaa5f191fa9bb546befa5 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 11 Jan 2011 13:20:50 -0500
Subject: Accordion: Start the accordion animation before changing classes.
 Fixes #6720 - Accordion: ol numbering bug.

Thanks Tony Ross.
---
 ui/jquery.ui.accordion.js | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 96a69d4f3..21e96a3c3 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -347,8 +347,26 @@ $.widget( "ui.accordion", {
 			return;
 		}
 
+		// find elements to show and hide
+		var active = this.active,
+			toShow = clicked.next(),
+			toHide = this.active.next(),
+			data = {
+				options: options,
+				newHeader: clickedIsActive && options.collapsible ? $([]) : clicked,
+				oldHeader: this.active,
+				newContent: clickedIsActive && options.collapsible ? $([]) : toShow,
+				oldContent: toHide
+			},
+			down = this.headers.index( this.active[0] ) > this.headers.index( clicked[0] );
+
+		// when the call to ._toggle() comes after the class changes
+		// it causes a very odd bug in IE 8 (see #6720)
+		this.active = clickedIsActive ? $([]) : clicked;
+		this._toggle( toShow, toHide, data, clickedIsActive, down );
+
 		// switch classes
-		this.active
+		active
 			.removeClass( "ui-state-active ui-corner-top" )
 			.addClass( "ui-state-default ui-corner-all" )
 			.children( ".ui-icon" )
@@ -366,21 +384,6 @@ $.widget( "ui.accordion", {
 				.addClass( "ui-accordion-content-active" );
 		}
 
-		// find elements to show and hide
-		var toShow = clicked.next(),
-			toHide = this.active.next(),
-			data = {
-				options: options,
-				newHeader: clickedIsActive && options.collapsible ? $([]) : clicked,
-				oldHeader: this.active,
-				newContent: clickedIsActive && options.collapsible ? $([]) : toShow,
-				oldContent: toHide
-			},
-			down = this.headers.index( this.active[0] ) > this.headers.index( clicked[0] );
-
-		this.active = clickedIsActive ? $([]) : clicked;
-		this._toggle( toShow, toHide, data, clickedIsActive, down );
-
 		return;
 	},
 
-- 
cgit v1.2.3


From ca46a3a8a9353e50e517ece4273639637e5b3cf1 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 12 Jan 2011 08:43:18 -0500
Subject: Position: Fixed calculation of collision dimensions. Fixes #6812 -
 Position: Collision detection fails on the right side in Internet Explorer.

---
 ui/jquery.ui.position.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js
index 9d490d274..fa0d05282 100644
--- a/ui/jquery.ui.position.js
+++ b/ui/jquery.ui.position.js
@@ -83,7 +83,7 @@ $.fn.position = function( options ) {
 
 	if ( options.at[0] === "right" ) {
 		basePosition.left += targetWidth;
-	} else if (options.at[0] === center ) {
+	} else if ( options.at[0] === center ) {
 		basePosition.left += targetWidth / 2;
 	}
 
@@ -103,9 +103,9 @@ $.fn.position = function( options ) {
 			marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0,
 			marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0,
 			collisionWidth = elemWidth + marginLeft +
-				parseInt( $.curCSS( this, "marginRight", true ) ) || 0,
+				( parseInt( $.curCSS( this, "marginRight", true ) ) || 0 ),
 			collisionHeight = elemHeight + marginTop +
-				parseInt( $.curCSS( this, "marginBottom", true ) ) || 0,
+				( parseInt( $.curCSS( this, "marginBottom", true ) ) || 0 ),
 			position = $.extend( {}, basePosition ),
 			collisionPosition;
 
-- 
cgit v1.2.3


From 3471bd66e0ff5d96c8ac867dbecd2290a4708385 Mon Sep 17 00:00:00 2001
From: Alex Dovenmuehle <adovenmuehle@gmail.com>
Date: Wed, 12 Jan 2011 21:32:51 -0500
Subject: Accordion: Fixed weird behavior on accordion animations in IE. Fixed
 #5421 - Accordion header margins disappear in IE 8

---
 ui/jquery.ui.accordion.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ui')

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 21e96a3c3..580fda3ed 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -503,6 +503,8 @@ $.widget( "ui.accordion", {
 
 		// other classes are removed before the animation; this one needs to stay until completed
 		this.toHide.removeClass( "ui-accordion-content-active" );
+		// Work around for rendering bug in IE (#5421)
+		this.toHide.parent()[0].className = this.toHide.parent()[0].className;
 
 		this._trigger( "change", null, this.data );
 	}
-- 
cgit v1.2.3


From a7aa65d1fcbb21f6591985d05e147daa23df60d5 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 13 Jan 2011 16:36:14 -0500
Subject: Accordion - Make sure we have an element before trying to modify the
 className. Fixes #6856 - Accordion: Opening a panel after all panels have
 been collapsed causes an error.

---
 ui/jquery.ui.accordion.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 580fda3ed..b6970f5eb 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -504,7 +504,9 @@ $.widget( "ui.accordion", {
 		// other classes are removed before the animation; this one needs to stay until completed
 		this.toHide.removeClass( "ui-accordion-content-active" );
 		// Work around for rendering bug in IE (#5421)
-		this.toHide.parent()[0].className = this.toHide.parent()[0].className;
+		if ( this.toHide.length ) {
+			this.toHide.parent()[0].className = this.toHide.parent()[0].className;
+		}
 
 		this._trigger( "change", null, this.data );
 	}
-- 
cgit v1.2.3


From c6394d7afae12739a6302fd84cf15d7e7a2cc482 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sun, 16 Jan 2011 16:19:58 -0500
Subject: Tabs: Pass an element instead of jQuery object on initial show. Fixes
 #6867 - Inconsistent ui.panel contents for show event of tabs widget.

---
 ui/jquery.ui.tabs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 7c615c872..f006c5891 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -216,7 +216,7 @@ $.widget( "ui.tabs", {
 				// seems to be expected behavior that the show callback is fired
 				self.element.queue( "tabs", function() {
 					self._trigger( "show", null,
-						self._ui( self.anchors[ o.selected ], self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) ) ) );
+						self._ui( self.anchors[ o.selected ], self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) )[ 0 ] ) );
 				});
 
 				this.load( o.selected );
-- 
cgit v1.2.3


From 83fca58d1c4b641711bd5893f8eb5e1efb3c673a Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 17 Jan 2011 09:36:00 -0500
Subject: Updated copyright year.

---
 MIT-LICENSE.txt                        | 2 +-
 tests/jquery.simulate.js               | 2 +-
 themes/base/jquery.ui.accordion.css    | 4 ++--
 themes/base/jquery.ui.all.css          | 2 +-
 themes/base/jquery.ui.autocomplete.css | 2 +-
 themes/base/jquery.ui.base.css         | 2 +-
 themes/base/jquery.ui.button.css       | 2 +-
 themes/base/jquery.ui.core.css         | 2 +-
 themes/base/jquery.ui.datepicker.css   | 2 +-
 themes/base/jquery.ui.dialog.css       | 2 +-
 themes/base/jquery.ui.progressbar.css  | 2 +-
 themes/base/jquery.ui.resizable.css    | 2 +-
 themes/base/jquery.ui.selectable.css   | 2 +-
 themes/base/jquery.ui.slider.css       | 2 +-
 themes/base/jquery.ui.tabs.css         | 2 +-
 themes/base/jquery.ui.theme.css        | 2 +-
 ui/jquery.effects.blind.js             | 2 +-
 ui/jquery.effects.bounce.js            | 2 +-
 ui/jquery.effects.clip.js              | 2 +-
 ui/jquery.effects.core.js              | 2 +-
 ui/jquery.effects.drop.js              | 2 +-
 ui/jquery.effects.explode.js           | 2 +-
 ui/jquery.effects.fade.js              | 2 +-
 ui/jquery.effects.fold.js              | 2 +-
 ui/jquery.effects.highlight.js         | 2 +-
 ui/jquery.effects.pulsate.js           | 2 +-
 ui/jquery.effects.scale.js             | 2 +-
 ui/jquery.effects.shake.js             | 2 +-
 ui/jquery.effects.slide.js             | 2 +-
 ui/jquery.effects.transfer.js          | 2 +-
 ui/jquery.ui.accordion.js              | 2 +-
 ui/jquery.ui.autocomplete.js           | 2 +-
 ui/jquery.ui.button.js                 | 2 +-
 ui/jquery.ui.core.js                   | 2 +-
 ui/jquery.ui.datepicker.js             | 2 +-
 ui/jquery.ui.dialog.js                 | 2 +-
 ui/jquery.ui.draggable.js              | 2 +-
 ui/jquery.ui.droppable.js              | 2 +-
 ui/jquery.ui.mouse.js                  | 2 +-
 ui/jquery.ui.position.js               | 2 +-
 ui/jquery.ui.progressbar.js            | 2 +-
 ui/jquery.ui.resizable.js              | 2 +-
 ui/jquery.ui.selectable.js             | 2 +-
 ui/jquery.ui.slider.js                 | 2 +-
 ui/jquery.ui.sortable.js               | 2 +-
 ui/jquery.ui.tabs.js                   | 2 +-
 ui/jquery.ui.widget.js                 | 2 +-
 47 files changed, 48 insertions(+), 48 deletions(-)

(limited to 'ui')

diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
index 2585de262..be226805d 100644
--- a/MIT-LICENSE.txt
+++ b/MIT-LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2010 Paul Bakaus, http://jqueryui.com/
+Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/
 
 This software consists of voluntary contributions made by many
 individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
diff --git a/tests/jquery.simulate.js b/tests/jquery.simulate.js
index 81d7f62bf..a88b6cbe4 100644
--- a/tests/jquery.simulate.js
+++ b/tests/jquery.simulate.js
@@ -1,7 +1,7 @@
 /*
  * jquery.simulate - simulate browser mouse and keyboard events
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.accordion.css b/themes/base/jquery.ui.accordion.css
index 6edf6e5ef..c309417dc 100644
--- a/themes/base/jquery.ui.accordion.css
+++ b/themes/base/jquery.ui.accordion.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Accordion @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -16,4 +16,4 @@
 .ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
 .ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
 .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
\ No newline at end of file
+.ui-accordion .ui-accordion-content-active { display: block; }
diff --git a/themes/base/jquery.ui.all.css b/themes/base/jquery.ui.all.css
index 0302dfb96..96b15aa51 100644
--- a/themes/base/jquery.ui.all.css
+++ b/themes/base/jquery.ui.all.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI CSS Framework @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.autocomplete.css b/themes/base/jquery.ui.autocomplete.css
index ea370d63e..0d30d77a5 100644
--- a/themes/base/jquery.ui.autocomplete.css
+++ b/themes/base/jquery.ui.autocomplete.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Autocomplete @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.base.css b/themes/base/jquery.ui.base.css
index 7634fb61e..21703833e 100644
--- a/themes/base/jquery.ui.base.css
+++ b/themes/base/jquery.ui.base.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI CSS Framework @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css
index 00c2b3b15..0d11065f4 100644
--- a/themes/base/jquery.ui.button.css
+++ b/themes/base/jquery.ui.button.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Button @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.core.css b/themes/base/jquery.ui.core.css
index 5cb485cd1..59e14d572 100644
--- a/themes/base/jquery.ui.core.css
+++ b/themes/base/jquery.ui.core.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI CSS Framework @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.datepicker.css b/themes/base/jquery.ui.datepicker.css
index f9098e3a7..f457800f4 100644
--- a/themes/base/jquery.ui.datepicker.css
+++ b/themes/base/jquery.ui.datepicker.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Datepicker @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css
index 751ff5226..12609ed19 100644
--- a/themes/base/jquery.ui.dialog.css
+++ b/themes/base/jquery.ui.dialog.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Dialog @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.progressbar.css b/themes/base/jquery.ui.progressbar.css
index 50fe84a6f..38364fafa 100644
--- a/themes/base/jquery.ui.progressbar.css
+++ b/themes/base/jquery.ui.progressbar.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Progressbar @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.resizable.css b/themes/base/jquery.ui.resizable.css
index 3b86c7c3a..eeb547b9f 100644
--- a/themes/base/jquery.ui.resizable.css
+++ b/themes/base/jquery.ui.resizable.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Resizable @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.selectable.css b/themes/base/jquery.ui.selectable.css
index de2f7f3b6..5177f6b1f 100644
--- a/themes/base/jquery.ui.selectable.css
+++ b/themes/base/jquery.ui.selectable.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Selectable @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.slider.css b/themes/base/jquery.ui.slider.css
index 0b1d31e94..8d9b403a9 100644
--- a/themes/base/jquery.ui.slider.css
+++ b/themes/base/jquery.ui.slider.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Slider @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.tabs.css b/themes/base/jquery.ui.tabs.css
index 5b3b58e81..12666facd 100644
--- a/themes/base/jquery.ui.tabs.css
+++ b/themes/base/jquery.ui.tabs.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Tabs @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/themes/base/jquery.ui.theme.css b/themes/base/jquery.ui.theme.css
index 922054384..7d4398465 100644
--- a/themes/base/jquery.ui.theme.css
+++ b/themes/base/jquery.ui.theme.css
@@ -1,7 +1,7 @@
 /*
  * jQuery UI CSS Framework @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.blind.js b/ui/jquery.effects.blind.js
index 44f398a55..f1b823533 100644
--- a/ui/jquery.effects.blind.js
+++ b/ui/jquery.effects.blind.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Blind @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.bounce.js b/ui/jquery.effects.bounce.js
index ec4a77ec4..055b47596 100644
--- a/ui/jquery.effects.bounce.js
+++ b/ui/jquery.effects.bounce.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Bounce @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.clip.js b/ui/jquery.effects.clip.js
index 9fa8df94a..c0fe450c9 100644
--- a/ui/jquery.effects.clip.js
+++ b/ui/jquery.effects.clip.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Clip @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index bb88dcf19..a97ca040d 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js
index 941508b2e..f13dda856 100644
--- a/ui/jquery.effects.drop.js
+++ b/ui/jquery.effects.drop.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Drop @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.explode.js b/ui/jquery.effects.explode.js
index 05d9bcd39..80e12770f 100644
--- a/ui/jquery.effects.explode.js
+++ b/ui/jquery.effects.explode.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Explode @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.fade.js b/ui/jquery.effects.fade.js
index 40483ee0c..9fa8a79c4 100644
--- a/ui/jquery.effects.fade.js
+++ b/ui/jquery.effects.fade.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Fade @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.fold.js b/ui/jquery.effects.fold.js
index f19ae1bf2..fa98ee2dd 100644
--- a/ui/jquery.effects.fold.js
+++ b/ui/jquery.effects.fold.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Fold @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.highlight.js b/ui/jquery.effects.highlight.js
index bd6d21b25..9a3edc5bc 100644
--- a/ui/jquery.effects.highlight.js
+++ b/ui/jquery.effects.highlight.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Highlight @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.pulsate.js b/ui/jquery.effects.pulsate.js
index 4d325c4e1..8eb999017 100644
--- a/ui/jquery.effects.pulsate.js
+++ b/ui/jquery.effects.pulsate.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Pulsate @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js
index d980882db..281021380 100644
--- a/ui/jquery.effects.scale.js
+++ b/ui/jquery.effects.scale.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Scale @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.shake.js b/ui/jquery.effects.shake.js
index b94e5a5ab..14c941809 100644
--- a/ui/jquery.effects.shake.js
+++ b/ui/jquery.effects.shake.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Shake @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.slide.js b/ui/jquery.effects.slide.js
index 59f6dc578..35a584fd9 100644
--- a/ui/jquery.effects.slide.js
+++ b/ui/jquery.effects.slide.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Slide @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.effects.transfer.js b/ui/jquery.effects.transfer.js
index 2741e9d4b..4b4c41050 100644
--- a/ui/jquery.effects.transfer.js
+++ b/ui/jquery.effects.transfer.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Effects Transfer @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index b6970f5eb..aac9a4891 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Accordion @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 76ceb24c0..2ab3bfda9 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Autocomplete @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 78134e308..e767fe4e1 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Button @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js
index bda679554..4c1999310 100644
--- a/ui/jquery.ui.core.js
+++ b/ui/jquery.ui.core.js
@@ -1,7 +1,7 @@
 /*!
  * jQuery UI @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index abcb37067..3ca6a34fb 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Datepicker @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index c53169b5b..e88679fc7 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Dialog @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 8eeaf6120..7402a3aa7 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Draggable @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index 084f845c7..decdc1712 100644
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Droppable @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index bfe8640a2..f5e8b58c0 100644
--- a/ui/jquery.ui.mouse.js
+++ b/ui/jquery.ui.mouse.js
@@ -1,7 +1,7 @@
 /*!
  * jQuery UI Mouse @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js
index fa0d05282..837f23f40 100644
--- a/ui/jquery.ui.position.js
+++ b/ui/jquery.ui.position.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Position @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js
index 009049d27..70c6e025c 100644
--- a/ui/jquery.ui.progressbar.js
+++ b/ui/jquery.ui.progressbar.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Progressbar @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index a835ef9a8..38d543d20 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Resizable @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.selectable.js b/ui/jquery.ui.selectable.js
index e776e483d..fa7d01122 100644
--- a/ui/jquery.ui.selectable.js
+++ b/ui/jquery.ui.selectable.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Selectable @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index d3b4744e3..f6bc57025 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Slider @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 6cc2434e8..34cba4272 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Sortable @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index f006c5891..20ad162eb 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -1,7 +1,7 @@
 /*
  * jQuery UI Tabs @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index fadf81f2b..a0df33e1c 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -1,7 +1,7 @@
 /*!
  * jQuery UI Widget @VERSION
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
-- 
cgit v1.2.3


From b3145fb5bcfe6e8f283cb92cb368d094568e02ff Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 17 Jan 2011 09:26:30 -0500
Subject: Datepicker i18n: Added Australian and New Zealand localizations.
 Fixes #6828 - Datepicker: Add en-AU or en-NZ initialisations.

Thanks Campbell
---
 demos/datepicker/localization.html    |  2 ++
 demos/index.html                      |  2 ++
 ui/i18n/jquery.ui.datepicker-en-AU.js | 23 +++++++++++++++++++++++
 ui/i18n/jquery.ui.datepicker-en-NZ.js | 23 +++++++++++++++++++++++
 4 files changed, 50 insertions(+)
 create mode 100644 ui/i18n/jquery.ui.datepicker-en-AU.js
 create mode 100644 ui/i18n/jquery.ui.datepicker-en-NZ.js

(limited to 'ui')

diff --git a/demos/datepicker/localization.html b/demos/datepicker/localization.html
index 9d32a4863..da9d010d2 100644
--- a/demos/datepicker/localization.html
+++ b/demos/datepicker/localization.html
@@ -18,7 +18,9 @@
 	<script src="../../ui/i18n/jquery.ui.datepicker-da.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-de.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-el.js"></script>
+	<script src="../../ui/i18n/jquery.ui.datepicker-en-AU.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-en-GB.js"></script>
+	<script src="../../ui/i18n/jquery.ui.datepicker-en-NZ.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-eo.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-es.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-et.js"></script>
diff --git a/demos/index.html b/demos/index.html
index 68418dc8a..56327aa6e 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -47,7 +47,9 @@
 	<script src="../ui/i18n/jquery.ui.datepicker-da.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-de.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-el.js"></script>
+	<script src="../ui/i18n/jquery.ui.datepicker-en-AU.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-en-GB.js"></script>
+	<script src="../ui/i18n/jquery.ui.datepicker-en-NZ.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-eo.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-es.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-et.js"></script>
diff --git a/ui/i18n/jquery.ui.datepicker-en-AU.js b/ui/i18n/jquery.ui.datepicker-en-AU.js
new file mode 100644
index 000000000..c1a1020a1
--- /dev/null
+++ b/ui/i18n/jquery.ui.datepicker-en-AU.js
@@ -0,0 +1,23 @@
+/* English/Australia initialisation for the jQuery UI date picker plugin. */
+/* Based on the en-GB initialisation. */
+jQuery(function($){
+	$.datepicker.regional['en-AU'] = {
+		closeText: 'Done',
+		prevText: 'Prev',
+		nextText: 'Next',
+		currentText: 'Today',
+		monthNames: ['January','February','March','April','May','June',
+		'July','August','September','October','November','December'],
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['en-AU']);
+});
diff --git a/ui/i18n/jquery.ui.datepicker-en-NZ.js b/ui/i18n/jquery.ui.datepicker-en-NZ.js
new file mode 100644
index 000000000..7819df052
--- /dev/null
+++ b/ui/i18n/jquery.ui.datepicker-en-NZ.js
@@ -0,0 +1,23 @@
+/* English/New Zealand initialisation for the jQuery UI date picker plugin. */
+/* Based on the en-GB initialisation. */
+jQuery(function($){
+	$.datepicker.regional['en-NZ'] = {
+		closeText: 'Done',
+		prevText: 'Prev',
+		nextText: 'Next',
+		currentText: 'Today',
+		monthNames: ['January','February','March','April','May','June',
+		'July','August','September','October','November','December'],
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['en-NZ']);
+});
-- 
cgit v1.2.3


From 015ea163d1995f5a3f42fd394d9db3abdc0fa16a Mon Sep 17 00:00:00 2001
From: Ivan Peters <ivan@ivanpeters.com>
Date: Tue, 18 Jan 2011 16:25:58 +1300
Subject: Datepicker: Update parseDate to properly handle a string value in
 shortYearCutoff. Fixed #6872: parseDate does not default shortYearCutoff
 correctly.

---
 tests/unit/datepicker/datepicker_options.js | 25 +++++++++++++++----------
 ui/jquery.ui.datepicker.js                  |  2 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'ui')

diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index af561a783..33b07d694 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -796,16 +796,21 @@ test('parseDate', function() {
 	equalsDate($.datepicker.parseDate('\'day\' d \'of\' MM (\'\'DD\'\'), yy',
 		'day 3 of February (\'Saturday\'), 2001'), new Date(2001, 2 - 1, 3),
 		'Parse date \'day\' d \'of\' MM (\'\'DD\'\'), yy');
-	equalsDate($.datepicker.parseDate('ymmdd', '010203'),
-		new Date(2001, 2 - 1, 3), 'Parse date ymmdd - default cutoff');
-	equalsDate($.datepicker.parseDate('y-m-d', '01-02-03'),
-		new Date(2001, 2 - 1, 3), 'Parse date y-m-d - default cutoff');
-	equalsDate($.datepicker.parseDate('y-m-d', '51-02-03'),
-		new Date(1951, 2 - 1, 3), 'Parse date y-m-d - default cutoff');
-	equalsDate($.datepicker.parseDate('y-m-d', '51-02-03', {shortYearCutoff: 80}),
-		new Date(2051, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
-	equalsDate($.datepicker.parseDate('y-m-d', '51-02-03', {shortYearCutoff: '+60'}),
-		new Date(2051, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
+	var currentYear = new Date().getFullYear();
+	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000) + '-02-03'),
+			new Date(currentYear, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
+	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 10) + '-02-03'),
+			new Date(currentYear+10, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
+	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 11) + '-02-03'),
+			new Date(currentYear-89, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
+	equalsDate($.datepicker.parseDate('y-m-d', '80-02-03', {shortYearCutoff: 80}),
+		new Date(2080, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
+	equalsDate($.datepicker.parseDate('y-m-d', '81-02-03', {shortYearCutoff: 80}),
+		new Date(1981, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
+	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 60) + '-02-03', {shortYearCutoff: '+60'}),
+			new Date(currentYear + 60, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
+	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 61) + '-02-03', {shortYearCutoff: '+60'}),
+			new Date(currentYear - 39, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
 	var gmtDate = new Date(2001, 2 - 1, 3);
 	gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
 	equalsDate($.datepicker.parseDate('@', '981158400000'), gmtDate, 'Parse date @');
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 3ca6a34fb..6b46dcfe2 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -966,6 +966,8 @@ $.extend(Datepicker.prototype, {
 		if (value == '')
 			return null;
 		var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff;
+		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
+				new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
 		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
 		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
 		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
-- 
cgit v1.2.3


From 0ed452bf2581a83781c417dffe6ed4e3dbe2d676 Mon Sep 17 00:00:00 2001
From: Christoph Burgdorf <christoph.burgdorf@bvsn.org>
Date: Tue, 18 Jan 2011 23:10:43 +0100
Subject: Draggable: Incase helper is not set to 'original' succeed with revert
 action even if the original element has been removed. Fixes #6871

---
 ui/jquery.ui.draggable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 7402a3aa7..4fef14498 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -192,8 +192,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 			this.dropped = false;
 		}
 		
-		//if the original element is removed, don't bother to continue
-		if(!this.element[0] || !this.element[0].parentNode)
+		//if the original element is removed, don't bother to continue if helper is set to "original"
+		if((!this.element[0] || !this.element[0].parentNode) && this.options.helper == "original")
 			return false;
 
 		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
-- 
cgit v1.2.3


From cf622cacd61238e2f5882e9988f47539a860c42e Mon Sep 17 00:00:00 2001
From: cherif <cherif@cherif.(none)>
Date: Sat, 15 Jan 2011 21:23:02 +0100
Subject: Datepicker i18n: Added Algerian Arabic. Fixes #6877 - Datepicker: Add
 Algerian Arabic support. (cherry picked from commit
 fcf8c2631c8e3d78b1565af856cb44ca6bc21b60)

---
 ui/i18n/jquery.ui.datepicker-ar-DZ.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 ui/i18n/jquery.ui.datepicker-ar-DZ.js

(limited to 'ui')

diff --git a/ui/i18n/jquery.ui.datepicker-ar-DZ.js b/ui/i18n/jquery.ui.datepicker-ar-DZ.js
new file mode 100644
index 000000000..089208dfa
--- /dev/null
+++ b/ui/i18n/jquery.ui.datepicker-ar-DZ.js
@@ -0,0 +1,24 @@
+/* Algerian Arabic Translation for jQuery UI date picker plugin. (can be used for Tunisia)*/
+/* Mohamed Cherif BOUCHELAGHEM -- cherifbouchelaghem@yahoo.fr */
+/* NOTE: monthNames maybe original names are in jquery.ui.datepicker-ar.js, but we must use the months that we know here in North Africa which is جانفي فيفري they look like French months in arabic way but the rest is ok. More information for months in arabic http://en.wikipedia.org/wiki/Arabic_names_of_calendar_months*/
+
+jQuery(function($){
+	$.datepicker.regional['ar-DZ'] = {
+		closeText: 'إغلاق',
+		prevText: '&#x3c;السابق',
+		nextText: 'التالي&#x3e;',
+		currentText: 'اليوم',
+		monthNames: ['جانفي', 'فيفري', 'مارس', 'أفريل', 'ماي', 'جوان',
+		'جويلية', 'أوت', 'سبتمبر','أكتوبر', 'نوفمبر', 'ديسمبر'],
+		monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+		dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesMin: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		weekHeader: 'أسبوع',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 6,
+  		isRTL: true,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ar-DZ']);
+});
-- 
cgit v1.2.3


From 904548d5b76be42a6734bc87e7450815927898b9 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 19 Jan 2011 10:15:15 -0500
Subject: Datepicker i18n: Added Algerian Arabic to demos. (cherry picked from
 commit 30c9473d8f297d53f0d3715e8cd00b61b841a85a)

---
 demos/datepicker/localization.html    | 2 ++
 demos/index.html                      | 1 +
 ui/i18n/jquery.ui.datepicker-ar-DZ.js | 3 +--
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/demos/datepicker/localization.html b/demos/datepicker/localization.html
index 33d03c98c..767cdaa54 100644
--- a/demos/datepicker/localization.html
+++ b/demos/datepicker/localization.html
@@ -10,6 +10,7 @@
 	<script src="../../ui/jquery.ui.datepicker.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-af.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-ar.js"></script>
+	<script src="../../ui/i18n/jquery.ui.datepicker-ar-DZ.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-az.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-bg.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-bs.js"></script>
@@ -87,6 +88,7 @@
 	<select id="locale">
 		<option value="af">Afrikaans</option>
 		<option value="sq">Albanian (Gjuha shqipe)</option>
+		<option value="ar-DZ">Algerian Arabic</option>
 		<option value="ar">Arabic (&#8235;(&#1604;&#1593;&#1585;&#1576;&#1610;</option>
 		<option value="hy">Armenian (&#1344;&#1377;&#1397;&#1381;&#1408;&#1381;&#1398;)</option>
 		<option value="az">Azerbaijani (Az&#601;rbaycan dili)</option>
diff --git a/demos/index.html b/demos/index.html
index 412dbf99f..510e24f0b 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -39,6 +39,7 @@
 	<script src="../ui/jquery.effects.transfer.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-af.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-ar.js"></script>
+	<script src="../ui/i18n/jquery.ui.datepicker-ar-DZ.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-az.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-bs.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-bg.js"></script>
diff --git a/ui/i18n/jquery.ui.datepicker-ar-DZ.js b/ui/i18n/jquery.ui.datepicker-ar-DZ.js
index 089208dfa..e0e1685d8 100644
--- a/ui/i18n/jquery.ui.datepicker-ar-DZ.js
+++ b/ui/i18n/jquery.ui.datepicker-ar-DZ.js
@@ -1,6 +1,5 @@
-/* Algerian Arabic Translation for jQuery UI date picker plugin. (can be used for Tunisia)*/
+/* Algerian Arabic Translation for jQuery UI date picker plugin. (can be used for Tunisia)*/
 /* Mohamed Cherif BOUCHELAGHEM -- cherifbouchelaghem@yahoo.fr */
-/* NOTE: monthNames maybe original names are in jquery.ui.datepicker-ar.js, but we must use the months that we know here in North Africa which is جانفي فيفري they look like French months in arabic way but the rest is ok. More information for months in arabic http://en.wikipedia.org/wiki/Arabic_names_of_calendar_months*/
 
 jQuery(function($){
 	$.datepicker.regional['ar-DZ'] = {
-- 
cgit v1.2.3


From 465c4c2cbef33fc4491d862245180b6441875c15 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 19 Jan 2011 10:45:44 -0500
Subject: Sortable: pass a fake event object to _mouseUp on cancel. Fixes #5882
 - UI.Sortable .sortable( cancel ) call the this._mouseUp method without
 param. (cherry picked from commit cf0c32f335479d00224d69f3c5ff53d147a6a8e6)

---
 ui/jquery.ui.sortable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 34cba4272..5ba82c312 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -360,7 +360,7 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 		if(this.dragging) {
 
-			this._mouseUp();
+			this._mouseUp({ target: null });
 
 			if(this.options.helper == "original")
 				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-- 
cgit v1.2.3


From 1ce8cf885f8f83b3c449629acb7124e31f4c71c3 Mon Sep 17 00:00:00 2001
From: "marcos.sousa" <marcos.sousa@corp.globo.com>
Date: Tue, 18 Jan 2011 16:33:30 -0200
Subject: Sortable: Make sure we have a placeholder before trying to remove it
 during a cancel. Fixes #6879 - Sortable: Calling cancel when there is no sort
 occurring throws an error. (cherry picked from commit
 f165c93127495d5041c3d49fa592fddbe8000bd1)

---
 ui/jquery.ui.sortable.js | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 5ba82c312..a48350f27 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -378,21 +378,23 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 		}
 
-		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-		if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-		if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
-
-		$.extend(this, {
-			helper: null,
-			dragging: false,
-			reverting: false,
-			_noFinalSort: null
-		});
+		if (this.placeholder) {
+			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+			if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+			if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
+
+			$.extend(this, {
+				helper: null,
+				dragging: false,
+				reverting: false,
+				_noFinalSort: null
+			});
 
-		if(this.domPosition.prev) {
-			$(this.domPosition.prev).after(this.currentItem);
-		} else {
-			$(this.domPosition.parent).prepend(this.currentItem);
+			if(this.domPosition.prev) {
+				$(this.domPosition.prev).after(this.currentItem);
+			} else {
+				$(this.domPosition.parent).prepend(this.currentItem);
+			}
 		}
 
 		return this;
-- 
cgit v1.2.3


From 6b9b513e77deebe33bf8c81268a587c1f022556f Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 27 Jan 2011 14:49:59 -0500
Subject: Autocomplete: Fixed handling of race conditions when using jQuery
 1.3.2. Fixes #6904 - Autocomplete: Race condition handling means. (cherry
 picked from commit a1ab9678e9bba6b20989104040bc31b782094335)

---
 ui/jquery.ui.autocomplete.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 2ab3bfda9..a497b72fd 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -14,6 +14,9 @@
  */
 (function( $, undefined ) {
 
+// used to prevent race conditions with remote data sources
+var requestIndex = 0;
+
 $.widget( "ui.autocomplete", {
 	options: {
 		appendTo: "body",
@@ -256,17 +259,16 @@ $.widget( "ui.autocomplete", {
 					url: url,
 					data: request,
 					dataType: "json",
-					success: function( data, status, xhr ) {
-						if ( xhr === self.xhr ) {
+					autocompleteRequest: ++requestIndex,
+					success: function( data, status ) {
+						if ( this.autocompleteRequest === requestIndex ) {
 							response( data );
 						}
-						self.xhr = null;
 					},
-					error: function( xhr ) {
-						if ( xhr === self.xhr ) {
+					error: function() {
+						if ( this.autocompleteRequest === requestIndex ) {
 							response( [] );
 						}
-						self.xhr = null;
 					}
 				});
 			};
-- 
cgit v1.2.3


From d6fa44a0b4c5bf08f31040f9008e8fb54b36db02 Mon Sep 17 00:00:00 2001
From: George Marshall <echosx@gmail.com>
Date: Tue, 1 Feb 2011 18:52:17 -0800
Subject: Resizable: Changed the way box size is determined when using a
 helper. Fixed #6926 - Window doesn't change to size that helper shows when
 snapping to grid (cherry picked from commit
 002f9a2629b906983c0b9edaffa0f7b9b5e457f5)

---
 ui/jquery.ui.resizable.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index 38d543d20..1e1706a9d 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -322,10 +322,10 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 		if(this._helper) {
 			var pr = this._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
-						soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
-							soffsetw = ista ? 0 : self.sizeDiff.width;
+				soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+				soffsetw = ista ? 0 : self.sizeDiff.width;
 
-			var s = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
+			var s = { width: (self.helper.width()  - soffsetw), height: (self.helper.height() - soffseth) },
 				left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
 				top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
 
-- 
cgit v1.2.3


From d14366abcea59b4fb6d0fb1ce48a6ad196ddff3a Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 3 Feb 2011 08:51:50 -0500
Subject: Datepicker: only set the focus explicitly if it is not already on the
 target field. Fixed #6694 – datepicker does not fire change event in IE8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

jQuery stores the current content of a field whenever it gets the focus. Since the fixed function is also called for KeyUp events the change event is not triggered anymore when the input looses focus.
(cherry picked from commit 39cf7d5bb4f9dfe1ada5dc2499f5c91e536ec96b)
---
 ui/jquery.ui.datepicker.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 6b46dcfe2..018c6cf84 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -700,7 +700,9 @@ $.extend(Datepicker.prototype, {
 		inst.dpDiv[(this._get(inst, 'isRTL') ? 'add' : 'remove') +
 			'Class']('ui-datepicker-rtl');
 		if (inst == $.datepicker._curInst && $.datepicker._datepickerShowing && inst.input &&
-				inst.input.is(':visible') && !inst.input.is(':disabled'))
+				// #6694 - don't focus the input if it's already focused
+				// this breaks the change event in IE
+				inst.input.is(':visible') && !inst.input.is(':disabled') && inst.input[0] != document.activeElement)
 			inst.input.focus();
 		// deffered render of the years select (to avoid flashes on Firefox) 
 		if( inst.yearshtml ){
-- 
cgit v1.2.3


From 9191ee3cd806c0e93a2cdf37125ff7b70e738e6b Mon Sep 17 00:00:00 2001
From: Alex Dovenmuehle <adovenmuehle@gmail.com>
Date: Thu, 10 Feb 2011 22:11:59 -0500
Subject: Button: Batched class changes to improve performance. Fixes #6934.
 Button: Batch class changes to improve performance. (cherry picked from
 commit 5b104dbcefdfa708d80e8babea0539617167012d)

---
 ui/jquery.ui.button.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index e767fe4e1..a32d3991e 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -290,27 +290,32 @@ $.widget( "ui.button", {
 				.appendTo( buttonElement.empty() )
 				.text(),
 			icons = this.options.icons,
-			multipleIcons = icons.primary && icons.secondary;
+			multipleIcons = icons.primary && icons.secondary,
+			buttonClasses = [];  
+
 		if ( icons.primary || icons.secondary ) {
-			buttonElement.addClass( "ui-button-text-icon" +
-				( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+			buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+
 			if ( icons.primary ) {
 				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
 			}
+
 			if ( icons.secondary ) {
 				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
 			}
+
 			if ( !this.options.text ) {
-				buttonElement
-					.addClass( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" )
-					.removeClass( "ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary" );
+				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
+				buttonElement.removeClass( "ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary" );
+
 				if ( !this.hasTitle ) {
 					buttonElement.attr( "title", buttonText );
 				}
 			}
 		} else {
-			buttonElement.addClass( "ui-button-text-only" );
+			buttonClasses.push( "ui-button-text-only" );
 		}
+		buttonElement.addClass( buttonClasses.join( " " ) );
 	}
 });
 
-- 
cgit v1.2.3


From cf9dac6c1704150d40191573767e5bfa58dcd9d2 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 15 Feb 2011 08:38:09 -0500
Subject: Datepicker: Properly handle datepickers attached to inputs that are
 hidden using CSS. Fixes #6988 - Datepicker: Treat all hidden text fields the
 same. (cherry picked from commit 6fbee255d8d895c7e84a4b2eaad2cfadc8a3425a)

---
 ui/jquery.ui.datepicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 018c6cf84..6c2e90795 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -754,7 +754,7 @@ $.extend(Datepicker.prototype, {
 	_findPos: function(obj) {
 		var inst = this._getInst(obj);
 		var isRTL = this._get(inst, 'isRTL');
-        while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) {
+        while (obj && (obj.type == 'hidden' || obj.nodeType != 1 || $.expr.filters.hidden(obj))) {
             obj = obj[isRTL ? 'previousSibling' : 'nextSibling'];
         }
         var position = $(obj).offset();
-- 
cgit v1.2.3


From 685ac7a042536b005ab1cf8a59464d66bcc32cde Mon Sep 17 00:00:00 2001
From: Martin Solli <msolli@gmail.com>
Date: Mon, 14 Feb 2011 05:49:33 -0800
Subject: Datepicker: improved translation of Norwegian names for days and
 months. Fixed #6986 - Improved translation of day and month names(cherry
 picked from commit d505c7c66d9041988c4563801d781b47cad2e439)

---
 ui/i18n/jquery.ui.datepicker-no.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'ui')

diff --git a/ui/i18n/jquery.ui.datepicker-no.js b/ui/i18n/jquery.ui.datepicker-no.js
index 6b3a498be..2507043a3 100644
--- a/ui/i18n/jquery.ui.datepicker-no.js
+++ b/ui/i18n/jquery.ui.datepicker-no.js
@@ -1,23 +1,23 @@
 /* Norwegian initialisation for the jQuery UI date picker plugin. */
 /* Written by Naimdjon Takhirov (naimdjon@gmail.com). */
+
 jQuery(function($){
-    $.datepicker.regional['no'] = {
-		closeText: 'Lukk',
-        prevText: '&laquo;Forrige',
-		nextText: 'Neste&raquo;',
-		currentText: 'I dag',
-        monthNames: ['Januar','Februar','Mars','April','Mai','Juni',
-        'Juli','August','September','Oktober','November','Desember'],
-        monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun',
-        'Jul','Aug','Sep','Okt','Nov','Des'],
-		dayNamesShort: ['Søn','Man','Tir','Ons','Tor','Fre','Lør'],
-		dayNames: ['Søndag','Mandag','Tirsdag','Onsdag','Torsdag','Fredag','Lørdag'],
-		dayNamesMin: ['Sø','Ma','Ti','On','To','Fr','Lø'],
-		weekHeader: 'Uke',
-        dateFormat: 'dd.mm.yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-    $.datepicker.setDefaults($.datepicker.regional['no']);
+  $.datepicker.regional['no'] = {
+    closeText: 'Lukk',
+    prevText: '&laquo;Forrige',
+    nextText: 'Neste&raquo;',
+    currentText: 'I dag',
+    monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
+    monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
+    dayNamesShort: ['søn','man','tir','ons','tor','fre','lør'],
+    dayNames: ['søndag','mandag','tirsdag','onsdag','torsdag','fredag','lørdag'],
+    dayNamesMin: ['sø','ma','ti','on','to','fr','lø'],
+    weekHeader: 'Uke',
+    dateFormat: 'dd.mm.yy',
+    firstDay: 1,
+    isRTL: false,
+    showMonthAfterYear: false,
+    yearSuffix: ''
+  };
+  $.datepicker.setDefaults($.datepicker.regional['no']);
 });
-- 
cgit v1.2.3


From ab7a5b441aab8722429f8333bf8524fea4b00374 Mon Sep 17 00:00:00 2001
From: Dan Heberden <danheberden@gmail.com>
Date: Tue, 15 Feb 2011 10:15:46 -0800
Subject: Datepicker: prevent datepicker initialization on empty jquery
 collection and add unit test. Fixed #6976 - datepicker creates extra dom
 element with empty object (cherry picked from commit
 5c3dc7d48ae501bd52476bfc45905130577d52c9)

---
 tests/unit/datepicker/datepicker_core.js | 5 +++++
 ui/jquery.ui.datepicker.js               | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js
index 9867022f7..2730ec861 100644
--- a/tests/unit/datepicker/datepicker_core.js
+++ b/tests/unit/datepicker/datepicker_core.js
@@ -47,6 +47,11 @@ module("datepicker: core", {
 	}
 });
 
+test( "widget method - empty collection", function() {
+	$( "#nonExist" ).datepicker(); // should create nothing
+	ok( !$( "#ui-datepicker-div" ).length, "Non init on empty collection" );
+});
+
 test("widget method", function() {
 	var actual = $("#inp").datepicker().datepicker("widget")[0];
 	same($("body > #ui-datepicker-div:last-child")[0], actual);
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 6c2e90795..ff6ebad52 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1726,7 +1726,12 @@ function isArray(a) {
                     Object - settings for attaching new datepicker functionality
    @return  jQuery object */
 $.fn.datepicker = function(options){
-
+	
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+	
 	/* Initialise the date picker. */
 	if (!$.datepicker.initialized) {
 		$(document).mousedown($.datepicker._checkExternalClick).
-- 
cgit v1.2.3


From 9162679e1589e6883cee0ec462bce5e20ef47ec7 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 16 Feb 2011 13:15:14 -0500
Subject: Datepicker: Account for daylight saving when calculating number of
 days in a month. Fixes #6978 - In Calender for march 2011 dates showing till
 5th only.

Thanks jomyjohn
(cherry picked from commit c44818fccaeb4f41fdb8b8a00662169a4258b78c)
---
 ui/jquery.ui.datepicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index ff6ebad52..c23984530 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1656,7 +1656,7 @@ $.extend(Datepicker.prototype, {
 
 	/* Find the number of days in a given month. */
 	_getDaysInMonth: function(year, month) {
-		return 32 - new Date(year, month, 32).getDate();
+		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
 	},
 
 	/* Find the day of the week of the first of a month. */
-- 
cgit v1.2.3


From 971566d258af5ed5762e70ba7aa132f25121aed7 Mon Sep 17 00:00:00 2001
From: "adam j. sontag" <ajpiano@ajpiano.com>
Date: Fri, 18 Feb 2011 11:45:44 -0500
Subject: Datepicker: Display Year before Month in Hungarian i18n.  Fixes #7019
 - Hungarian Localisation has month-date in wrong order (cherry picked from
 commit b4bcc1bf9dc8673089eb7cdcc3378a93d7f0a678)

---
 ui/i18n/jquery.ui.datepicker-hu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/i18n/jquery.ui.datepicker-hu.js b/ui/i18n/jquery.ui.datepicker-hu.js
index 249e7b0ef..46e63f59b 100644
--- a/ui/i18n/jquery.ui.datepicker-hu.js
+++ b/ui/i18n/jquery.ui.datepicker-hu.js
@@ -17,7 +17,7 @@ jQuery(function($){
 		dateFormat: 'yy-mm-dd',
 		firstDay: 1,
 		isRTL: false,
-		showMonthAfterYear: false,
+		showMonthAfterYear: true,
 		yearSuffix: ''};
 	$.datepicker.setDefaults($.datepicker.regional['hu']);
 });
-- 
cgit v1.2.3


From 98513985a27153e54eac5cdccd4643047f88c63a Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 25 Feb 2011 10:40:36 +0100
Subject: Datepicker: Added Tajikistan localization. Fixes #7034 - Datepicker:
 Add Tajikistan localization. (cherry picked from commit
 0cd297702db890672a2886026200e9762de43e77)

---
 demos/datepicker/localization.html |  2 ++
 demos/index.html                   |  1 +
 ui/i18n/jquery.ui.datepicker-tj.js | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 ui/i18n/jquery.ui.datepicker-tj.js

(limited to 'ui')

diff --git a/demos/datepicker/localization.html b/demos/datepicker/localization.html
index 767cdaa54..766054c18 100644
--- a/demos/datepicker/localization.html
+++ b/demos/datepicker/localization.html
@@ -62,6 +62,7 @@
 	<script src="../../ui/i18n/jquery.ui.datepicker-sv.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-ta.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-th.js"></script>
+	<script src="../../ui/i18n/jquery.ui.datepicker-tj.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-tr.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-uk.js"></script>
 	<script src="../../ui/i18n/jquery.ui.datepicker-vi.js"></script>
@@ -143,6 +144,7 @@
 		<option value="sv">Swedish (Svenska)</option>
 		<option value="ta">Tamil (&#2980;&#2990;&#3007;&#2996;&#3021;)</option>
 		<option value="th">Thai (&#3616;&#3634;&#3625;&#3634;&#3652;&#3607;&#3618;)</option>
+		<option value="tj">Tajikistan</option>
 		<option value="tr">Turkish (T&uuml;rk&ccedil;e)</option>
 		<option value="uk">Ukranian (&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072;)</option>
 		<option value="vi">Vietnamese (Ti&#7871;ng Vi&#7879;t)</option>
diff --git a/demos/index.html b/demos/index.html
index 510e24f0b..d347ea50e 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -91,6 +91,7 @@
 	<script src="../ui/i18n/jquery.ui.datepicker-sv.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-ta.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-th.js"></script>
+	<script src="../ui/i18n/jquery.ui.datepicker-tj.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-tr.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-uk.js"></script>
 	<script src="../ui/i18n/jquery.ui.datepicker-vi.js"></script>
diff --git a/ui/i18n/jquery.ui.datepicker-tj.js b/ui/i18n/jquery.ui.datepicker-tj.js
new file mode 100644
index 000000000..ed662392c
--- /dev/null
+++ b/ui/i18n/jquery.ui.datepicker-tj.js
@@ -0,0 +1,23 @@
+/* Tajiki (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Abdurahmon Saidov (saidovab@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['tj'] = {
+		closeText: 'Идома',
+		prevText: '&#x3c;Қафо',
+		nextText: 'Пеш&#x3e;',
+		currentText: 'Имрӯз',
+		monthNames: ['Январ','Феврал','Март','Апрел','Май','Июн',
+		'Июл','Август','Сентябр','Октябр','Ноябр','Декабр'],
+		monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
+		'Июл','Авг','Сен','Окт','Ноя','Дек'],
+		dayNames: ['якшанбе','душанбе','сешанбе','чоршанбе','панҷшанбе','ҷумъа','шанбе'],
+		dayNamesShort: ['якш','душ','сеш','чор','пан','ҷум','шан'],
+		dayNamesMin: ['Як','Дш','Сш','Чш','Пш','Ҷм','Шн'],
+		weekHeader: 'Хф',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['tj']);
+});
\ No newline at end of file
-- 
cgit v1.2.3


From c9bbd9aa6e8bd23e314f4e284aec3b18c6ad797c Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 26 Feb 2011 11:13:00 +0100
Subject: Button: Only add text classes if there is text. Fixes #7040 - button
 class change breaks icon only buttons. (cherry picked from commit
 e72afe4afca0795fc785114cfeafbe08f5e2fdf3)

---
 ui/jquery.ui.button.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index a32d3991e..fc4c9aa6c 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -294,7 +294,9 @@ $.widget( "ui.button", {
 			buttonClasses = [];  
 
 		if ( icons.primary || icons.secondary ) {
-			buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+			if ( this.options.text ) {
+				buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+			}
 
 			if ( icons.primary ) {
 				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
@@ -306,7 +308,6 @@ $.widget( "ui.button", {
 
 			if ( !this.options.text ) {
 				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
-				buttonElement.removeClass( "ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary" );
 
 				if ( !this.hasTitle ) {
 					buttonElement.attr( "title", buttonText );
-- 
cgit v1.2.3


From bfb5582435bf330b1cbae5953bfa6fbe9747bafe Mon Sep 17 00:00:00 2001
From: Richard Worth <rdworth@gmail.com>
Date: Wed, 2 Mar 2011 21:27:09 -0500
Subject: Datepicker i18n: corrected arabic month name for May. Fixed #7055 -
 Datepicker: arabic month name has March in place of May (cherry picked from
 commit 5c6afa8e7bcf0b7111245ad703d28cfcefc1d59f)

---
 ui/i18n/jquery.ui.datepicker-ar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/i18n/jquery.ui.datepicker-ar.js b/ui/i18n/jquery.ui.datepicker-ar.js
index 9e37911c2..cfa6632b4 100644
--- a/ui/i18n/jquery.ui.datepicker-ar.js
+++ b/ui/i18n/jquery.ui.datepicker-ar.js
@@ -7,7 +7,7 @@ jQuery(function($){
 		prevText: '&#x3c;السابق',
 		nextText: 'التالي&#x3e;',
 		currentText: 'اليوم',
-		monthNames: ['كانون الثاني', 'شباط', 'آذار', 'نيسان', 'آذار', 'حزيران',
+		monthNames: ['كانون الثاني', 'شباط', 'آذار', 'نيسان', 'مايو', 'حزيران',
 		'تموز', 'آب', 'أيلول',	'تشرين الأول', 'تشرين الثاني', 'كانون الأول'],
 		monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
 		dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
-- 
cgit v1.2.3


From 20b010640e837cad1ad7203e02b28b399e328725 Mon Sep 17 00:00:00 2001
From: michaelmwu <michaelmwu@gmail.com>
Date: Fri, 4 Mar 2011 22:17:30 -0800
Subject: Sortable: Changed floating calculation to determine also whether
 items are being displayed horizontally. Helps fix odd sorting behavior for
 horizontal lists. Fixed #6702 - horizontal sortable not working (and
 solution)(cherry picked from commit f1d939bc589fd8d211e0dc540f7d92cfae94a411)

---
 ui/jquery.ui.sortable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index a48350f27..15b6b8113 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -49,8 +49,8 @@ $.widget("ui.sortable", $.ui.mouse, {
 		//Get the items
 		this.refresh();
 
-		//Let's determine if the items are floating
-		this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false;
+		//Let's determine if the items are being displayed horizontally
+		this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
 
 		//Let's determine the parent's offset
 		this.offset = this.element.offset();
-- 
cgit v1.2.3


From 12d38b1886b1e4a17d3bd018f028f7fa2b821229 Mon Sep 17 00:00:00 2001
From: Adam Parod <mystic414@gmail.com>
Date: Thu, 17 Feb 2011 15:17:40 -0600
Subject: Datepicker: Reformat minDate/maxDate when dateFormat changes. Fixes
 #7009 - Reformat minDate/maxDate when dateFormat changes. (cherry picked from
 commit 74b7c3f684f5d83effcee6d5099c6fffb020fdf9)

---
 ui/jquery.ui.datepicker.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index c23984530..8dd9bf3dc 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -444,7 +444,14 @@ $.extend(Datepicker.prototype, {
 				this._hideDatepicker();
 			}
 			var date = this._getDateDatepicker(target, true);
+			var minDate = this._getMinMaxDate(inst, 'min');
+			var maxDate = this._getMinMaxDate(inst, 'max');
 			extendRemove(inst.settings, settings);
+			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
+			if (minDate !== null && settings['dateFormat'] !== undefined && settings['minDate'] === undefined)
+				inst.settings.minDate = this._formatDate(inst, minDate);
+			if (maxDate !== null && settings['dateFormat'] !== undefined && settings['maxDate'] === undefined)
+				inst.settings.maxDate = this._formatDate(inst, maxDate);
 			this._attachments($(target), inst);
 			this._autoSize(inst);
 			this._setDateDatepicker(target, date);
-- 
cgit v1.2.3


From 15aec63edc10bffcce638ff5244b5faba1ef51fd Mon Sep 17 00:00:00 2001
From: awgy <josh.varner@gmail.com>
Date: Sat, 5 Feb 2011 02:13:55 -0600
Subject: Mouse: Reset click event suppression on next mousedown. Fixes #6946 -
 Mouse: click event suppressed after drag in Gecko(cherry picked from commit
 548bdb12a116771b34a99ba97769ddef22f7d156)

---
 ui/jquery.ui.mouse.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ui')

diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index f5e8b58c0..bfe4a7578 100644
--- a/ui/jquery.ui.mouse.js
+++ b/ui/jquery.ui.mouse.js
@@ -75,6 +75,11 @@ $.widget("ui.mouse", {
 			}
 		}
 
+		// Click event may never have fired (Gecko & Opera)
+		if (true === $.data(event.target, this.widgetName + '.preventClickEvent')) {
+			$.removeData(event.target, this.widgetName + '.preventClickEvent');
+		}
+
 		// these delegates are required to keep context
 		this._mouseMoveDelegate = function(event) {
 			return self._mouseMove(event);
-- 
cgit v1.2.3


From a067dfa8a22f9705bd062cfd651feb0bff3e3cf6 Mon Sep 17 00:00:00 2001
From: Guillaume Gautreau <guillaume+github@ghusse.com>
Date: Tue, 8 Mar 2011 09:32:48 -0500
Subject: Draggable: modify margins of the containment according to the margin
 of the draggable element. Fixed #7084 - Draggable with parent containment and
 margin (cherry picked from commit 3a0ec399cdd19c7e7b11934aef559cfa6b8f8258)

---
 ui/jquery.ui.draggable.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 4fef14498..debdadd22 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -317,7 +317,9 @@ $.widget("ui.draggable", $.ui.mouse, {
 	_cacheMargins: function() {
 		this.margins = {
 			left: (parseInt(this.element.css("marginLeft"),10) || 0),
-			top: (parseInt(this.element.css("marginTop"),10) || 0)
+			top: (parseInt(this.element.css("marginTop"),10) || 0),
+			right: (parseInt(this.element.css("marginRight"),10) || 0),
+			bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
 		};
 	},
 
@@ -345,10 +347,10 @@ $.widget("ui.draggable", $.ui.mouse, {
 			var over = ($(ce).css("overflow") != 'hidden');
 
 			this.containment = [
-				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
-				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
-				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
-				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0),
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top  - this.margins.bottom
 			];
 		} else if(o.containment.constructor == Array) {
 			this.containment = o.containment;
-- 
cgit v1.2.3


From c5b0a8660a57676815901b24be84b3a4bb5a625a Mon Sep 17 00:00:00 2001
From: Marcel Toele <EleotleCram@gmail.com>
Date: Fri, 11 Mar 2011 15:37:52 +0100
Subject: Droppable: enabled and accepting droppables are now activated prior
 to evaluating their geometry. Fixes #7104 Droppable: if activeClass changes
 the geometry of a droppable, then dnd uses the wrong geometry. (cherry picked
 from commit 86e6ed2eb18adcc7f9f96dc347848608cc3d3120)

---
 ui/jquery.ui.droppable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index decdc1712..b8a93cd46 100644
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -212,11 +212,11 @@ $.ui.ddmanager = {
 			for (var j=0; j < list.length; j++) { if(list[j] == m[i].element[0]) { m[i].proportions.height = 0; continue droppablesLoop; } }; //Filter out elements in the current dragged item
 			m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue; 									//If the element is not visible, continue
 
+			if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
+
 			m[i].offset = m[i].element.offset();
 			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
 
-			if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
-
 		}
 
 	},
-- 
cgit v1.2.3


From 2d6ad068733a18e5b69815192e7c0f5614410c56 Mon Sep 17 00:00:00 2001
From: ddstreet <ddstreet@ieee.org>
Date: Fri, 11 Mar 2011 10:52:13 -0500
Subject: Button: find associated label even without common ancestor. Fixes
 #7092 - button creation that requires a matching label does not find label in
 all cases (cherry picked from commit
 0b30a1d450f6b7d529732d6a39c5f4057efaaaf4)

---
 tests/unit/button/button_tickets.js | 22 ++++++++++++++++++++++
 ui/jquery.ui.button.js              | 12 ++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/tests/unit/button/button_tickets.js b/tests/unit/button/button_tickets.js
index 5c5053ded..79bbfeb5c 100644
--- a/tests/unit/button/button_tickets.js
+++ b/tests/unit/button/button_tickets.js
@@ -20,4 +20,26 @@ test( "#6262 - buttonset not applying ui-corner to invisible elements", function
 	ok( set.find( "label:eq(2)" ).is( ".ui-button.ui-corner-right" ) );
 });
 
+test( "#7092 - button creation that requires a matching label does not find label in all cases", function() {
+	var group = $( "<span><label for='t7092a'/><input type='checkbox' id='t7092a'/></span>" );
+	group.find( "input:checkbox" ).button();
+	ok( group.find( "label" ).is( ".ui-button" ) );
+
+	group = $( "<input type='checkbox' id='t7092b'/><label for='t7092b'/>" );
+	group.filter( "input:checkbox" ).button();
+	ok( group.filter( "label" ).is( ".ui-button" ) );
+
+	group = $( "<span><input type='checkbox' id='t7092c'/></span><label for='t7092c'/>" );
+	group.find( "input:checkbox" ).button();
+	ok( group.filter( "label" ).is( ".ui-button" ) );
+
+	group = $( "<span><input type='checkbox' id='t7092d'/></span><span><label for='t7092d'/></span>" );
+	group.find( "input:checkbox" ).button();
+	ok( group.find( "label" ).is( ".ui-button" ) );
+
+	group = $( "<input type='checkbox' id='t7092e'/><span><label for='t7092e'/></span>" );
+	group.filter( "input:checkbox" ).button();
+	ok( group.find( "label" ).is( ".ui-button" ) );
+});
+
 })( jQuery );
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index fc4c9aa6c..56e0d2d22 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -200,8 +200,16 @@ $.widget( "ui.button", {
 		if ( this.type === "checkbox" || this.type === "radio" ) {
 			// we don't search against the document in case the element
 			// is disconnected from the DOM
-			this.buttonElement = this.element.parents().last()
-				.find( "label[for=" + this.element.attr("id") + "]" );
+			var ancestor = this.element.parents().last(),
+				labelSelector = "label[for=" + this.element.attr("id") + "]";
+			this.buttonElement = ancestor.find( labelSelector );
+			if ( !this.buttonElement.length ) {
+				ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings();
+				this.buttonElement = ancestor.filter( labelSelector );
+				if ( !this.buttonElement.length ) {
+					this.buttonElement = ancestor.find( labelSelector );
+				}
+			}
 			this.element.addClass( "ui-helper-hidden-accessible" );
 
 			var checked = this.element.is( ":checked" );
-- 
cgit v1.2.3


From 6fcdff13fa4a14dd5427f71f83727b87520349fb Mon Sep 17 00:00:00 2001
From: Matt Hoskins <furlined@cat-basket.org>
Date: Mon, 14 Mar 2011 06:53:00 -0700
Subject: Draggable: Calling .refreshPositions instead of ._refreshItems when
 dragging with a connected sortable to force containerCache
 initialisation/update. Fixed: #5563 - connectToSortable misbehaves if the
 position of the sortable changes after the sortable and draggable have been
 initialised as _refreshItems no longer updating container cache.(cherry
 picked from commit 84257e7f0ae20b81b085f1360c15defdd2b89ea9)

---
 ui/jquery.ui.draggable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index debdadd22..d27255cac 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -477,7 +477,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
 					instance: sortable,
 					shouldRevert: sortable.options.revert
 				});
-				sortable._refreshItems();	//Do a one-time refresh at start to refresh the containerCache
+				sortable.refreshPositions();	// Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
 				sortable._trigger("activate", event, uiSortable);
 			}
 		});
-- 
cgit v1.2.3


From 6bbc43113ccd2722919e4149248c3316c143b287 Mon Sep 17 00:00:00 2001
From: Richard Worth <rdworth@gmail.com>
Date: Mon, 14 Mar 2011 17:18:35 -0400
Subject: Button: avoid .last() call to ensure compatibility with jQuery 1.3.
 Fixed #7089 - Button: .last() used in ui.button but not exists in jQ 1.3

---
 ui/jquery.ui.button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 56e0d2d22..bddedead6 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -200,7 +200,7 @@ $.widget( "ui.button", {
 		if ( this.type === "checkbox" || this.type === "radio" ) {
 			// we don't search against the document in case the element
 			// is disconnected from the DOM
-			var ancestor = this.element.parents().last(),
+			var ancestor = this.element.parents().filter(":last"),
 				labelSelector = "label[for=" + this.element.attr("id") + "]";
 			this.buttonElement = ancestor.find( labelSelector );
 			if ( !this.buttonElement.length ) {
-- 
cgit v1.2.3


From 69ebdf46a596de6e6889f9532fdad6ad841cc765 Mon Sep 17 00:00:00 2001
From: Richard Worth <rdworth@gmail.com>
Date: Tue, 15 Mar 2011 04:52:24 -0400
Subject: Accordion: set aria-selected to true on selected header, false on
 others. Fixed #7078 - Accordion: Set aria-selected

---
 tests/unit/accordion/accordion_core.js | 6 +++++-
 ui/jquery.ui.accordion.js              | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js
index 2bef43149..2d27f3bc0 100644
--- a/tests/unit/accordion/accordion_core.js
+++ b/tests/unit/accordion/accordion_core.js
@@ -14,7 +14,7 @@ test("handle click on header-descendant", function() {
 });
 
 test("accessibility", function () {
-	expect(9);
+	expect(13);
 	var ac = $('#list1').accordion().accordion("activate", 1);
 	var headers = $(".ui-accordion-header");
 
@@ -25,9 +25,13 @@ test("accessibility", function () {
 	equals( headers.next().attr("role"), "tabpanel", "tabpanel roles");
 	equals( headers.eq(1).attr("aria-expanded"), "true", "active tab has aria-expanded");
 	equals( headers.eq(0).attr("aria-expanded"), "false", "inactive tab has aria-expanded");
+	equals( headers.eq(1).attr("aria-selected"), "true", "active tab has aria-selected");
+	equals( headers.eq(0).attr("aria-selected"), "false", "inactive tab has aria-selected");
 	ac.accordion("activate", 0);
 	equals( headers.eq(0).attr("aria-expanded"), "true", "newly active tab has aria-expanded");
 	equals( headers.eq(1).attr("aria-expanded"), "false", "newly inactive tab has aria-expanded");
+	equals( headers.eq(0).attr("aria-selected"), "true", "active tab has aria-selected");
+	equals( headers.eq(1).attr("aria-selected"), "false", "inactive tab has aria-selected");
 });
 
 })(jQuery);
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index aac9a4891..9419089b5 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -114,6 +114,7 @@ $.widget( "ui.accordion", {
 			.not( self.active || "" )
 			.attr({
 				"aria-expanded": "false",
+				"aria-selected": "false",
 				tabIndex: -1
 			})
 			.next()
@@ -126,6 +127,7 @@ $.widget( "ui.accordion", {
 			self.active
 				.attr({
 					"aria-expanded": "true",
+					"aria-selected": "true",
 					tabIndex: 0
 				});
 		}
@@ -173,6 +175,7 @@ $.widget( "ui.accordion", {
 			.removeClass( "ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
 			.removeAttr( "role" )
 			.removeAttr( "aria-expanded" )
+			.removeAttr( "aria-selected" )
 			.removeAttr( "tabIndex" );
 
 		this.headers.find( "a" ).removeAttr( "tabIndex" );
@@ -477,12 +480,14 @@ $.widget( "ui.accordion", {
 		toHide.prev()
 			.attr({
 				"aria-expanded": "false",
+				"aria-selected": "false",
 				tabIndex: -1
 			})
 			.blur();
 		toShow.prev()
 			.attr({
 				"aria-expanded": "true",
+				"aria-selected": "true",
 				tabIndex: 0
 			})
 			.focus();
-- 
cgit v1.2.3


From 779df6517d4e1bdd7ed3667537adb67c7443d15f Mon Sep 17 00:00:00 2001
From: Richard Worth <rdworth@gmail.com>
Date: Tue, 15 Mar 2011 05:43:19 -0400
Subject: Autocomplete: new option autoFocus, default false. Fixed #7032 -
 Autocomplete: Add option to automatically highlight the first result

---
 tests/unit/autocomplete/autocomplete_defaults.js | 1 +
 ui/jquery.ui.autocomplete.js                     | 5 +++++
 2 files changed, 6 insertions(+)

(limited to 'ui')

diff --git a/tests/unit/autocomplete/autocomplete_defaults.js b/tests/unit/autocomplete/autocomplete_defaults.js
index fc92f3209..dd5007089 100644
--- a/tests/unit/autocomplete/autocomplete_defaults.js
+++ b/tests/unit/autocomplete/autocomplete_defaults.js
@@ -4,6 +4,7 @@
 
 var autocomplete_defaults = {
 	appendTo: "body",
+	autoFocus: false,
 	delay: 300,
 	disabled: false,
 	minLength: 1,
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index a497b72fd..204322320 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -20,6 +20,7 @@ var requestIndex = 0;
 $.widget( "ui.autocomplete", {
 	options: {
 		appendTo: "body",
+		autoFocus: false,
 		delay: 300,
 		minLength: 1,
 		position: {
@@ -359,6 +360,10 @@ $.widget( "ui.autocomplete", {
 		this.menu.deactivate();
 		this.menu.refresh();
 
+		if ( this.options.autoFocus ) {
+			this.menu.next( new $.Event("mouseover") );
+		}
+
 		// size and position menu
 		ul.show();
 		this._resizeMenu();
-- 
cgit v1.2.3


From 3cfba5d9a8ff6d4f70b4e6d9ea5db8c22ea90c43 Mon Sep 17 00:00:00 2001
From: Richard Worth <rdworth@gmail.com>
Date: Tue, 15 Mar 2011 12:26:47 -0400
Subject: Autocomplete: moved autoFocus implementation to after menu visible
 for a11y (cherry picked from commit 4026d3acd70508ca285bd4eb182b8f0b43eae5c8)

---
 ui/jquery.ui.autocomplete.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 204322320..dfe3fa3f3 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -360,16 +360,16 @@ $.widget( "ui.autocomplete", {
 		this.menu.deactivate();
 		this.menu.refresh();
 
-		if ( this.options.autoFocus ) {
-			this.menu.next( new $.Event("mouseover") );
-		}
-
 		// size and position menu
 		ul.show();
 		this._resizeMenu();
 		ul.position( $.extend({
 			of: this.element
 		}, this.options.position ));
+
+		if ( this.options.autoFocus ) {
+			this.menu.next( new $.Event("mouseover") );
+		}
 	},
 
 	_resizeMenu: function() {
-- 
cgit v1.2.3


From 2b4a902e00b076661dc99528c88536e9460d415a Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 18 Mar 2011 08:26:08 -0400
Subject: Datepicker: Changed a comment that causes problems with YUI
 Compressor. Fixes #7129 - Datepicker: Can't minify with YUI Compressor.
 (cherry picked from commit 6d0164571647e169c9674a2853f3223caf188e7e)

---
 ui/jquery.ui.datepicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 8dd9bf3dc..b07a5ee72 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1089,7 +1089,7 @@ $.extend(Datepicker.prototype, {
 		}
 		var date = this._daylightSavingAdjust(new Date(year, month - 1, day));
 		if (date.getFullYear() != year || date.getMonth() + 1 != month || date.getDate() != day)
-			throw 'Invalid date'; // E.g. 31/02/*
+			throw 'Invalid date'; // E.g. 31/02/00
 		return date;
 	},
 
-- 
cgit v1.2.3


From eb3d95543870447d1194f6e9e7c43c6d2637a35f Mon Sep 17 00:00:00 2001
From: Giovanni Giacobbi <giovanni@giacobbi.net>
Date: Sun, 20 Mar 2011 03:19:36 +0100
Subject: Restructured if/else's for better readability (cherry picked from
 commit 3ce8429f4fce08176c8bc06d4ff4bf8830f8c916)

---
 ui/jquery.ui.button.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index bddedead6..a98e96f46 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -182,21 +182,17 @@ $.widget( "ui.button", {
 	},
 
 	_determineButtonType: function() {
-		
+
 		if ( this.element.is(":checkbox") ) {
 			this.type = "checkbox";
+		} else if ( this.element.is(":radio") ) {
+			this.type = "radio";
+		} else if ( this.element.is("input") ) {
+			this.type = "input";
 		} else {
-			if ( this.element.is(":radio") ) {
-				this.type = "radio";
-			} else {
-				if ( this.element.is("input") ) {
-					this.type = "input";
-				} else {
-					this.type = "button";
-				}
-			}
+			this.type = "button";
 		}
-		
+
 		if ( this.type === "checkbox" || this.type === "radio" ) {
 			// we don't search against the document in case the element
 			// is disconnected from the DOM
-- 
cgit v1.2.3


From 8310d185b3a5fc8f433f0736a22298e84ac73f7d Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 28 Mar 2011 17:34:04 -0400
Subject: Slider: Properly handle value and value methods as setters. Fixes
 #4881 - Slider: value and values methods as setters aren't chainable. (cherry
 picked from commit 2197c61f1f91a7b5046fb994d370f38ded602ee6)

---
 tests/unit/slider/slider_methods.js | 6 +++---
 ui/jquery.ui.slider.js              | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/tests/unit/slider/slider_methods.js b/tests/unit/slider/slider_methods.js
index 77ae65148..4b2b0311d 100644
--- a/tests/unit/slider/slider_methods.js
+++ b/tests/unit/slider/slider_methods.js
@@ -74,7 +74,7 @@ test("value", function() {
 			value: 5
 		});
 		equals(el.slider('value'), 5, 'range: ' + this + ' slider method get');
-		el.slider('value', 10);
+		equals(el.slider('value', 10), el, 'value method is chainable');
 		equals(el.slider('value'), 10, 'range: ' + this + ' slider method set');
 		el.remove();
 	});
@@ -85,13 +85,13 @@ test("value", function() {
 	el.slider('option', 'value', -2);
 	equals(el.slider('option', 'value'), -2, 'value option does not respect min');
 	equals(el.slider('value'), -1, 'value method get respects min');
-	el.slider('value', -2);
+	equals(el.slider('value', -2), el, 'value method is chainable');
 	equals(el.slider('option', 'value'), -1, 'value method set respects min');
 	// max with value option vs value method
 	el.slider('option', 'value', 2);
 	equals(el.slider('option', 'value'), 2, 'value option does not respect max');
 	equals(el.slider('value'), 1, 'value method get respects max');
-	el.slider('value', 2);
+	equals(el.slider('value', 2), el, 'value method is chainable');
 	equals(el.slider('option', 'value'), 1, 'value method set respects max');
 });
 
diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index f6bc57025..a32e77966 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -466,6 +466,7 @@ $.widget( "ui.slider", $.ui.mouse, {
 			this.options.value = this._trimAlignValue( newValue );
 			this._refreshValue();
 			this._change( null, 0 );
+			return;
 		}
 
 		return this._value();
@@ -480,6 +481,7 @@ $.widget( "ui.slider", $.ui.mouse, {
 			this.options.values[ index ] = this._trimAlignValue( newValue );
 			this._refreshValue();
 			this._change( null, index );
+			return;
 		}
 
 		if ( arguments.length ) {
-- 
cgit v1.2.3


From a8fc3da62885c2d7c692e24f8416e320886e1e7b Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 4 Apr 2011 07:55:42 -0400
Subject: Datepicker: Only generate yearshtml once. Fixes #7176 - Datepicker
 shows only single year in year dropdown if numberOfMonths > 1. (cherry picked
 from commit 98c53d8432990f2c674e3a1274141b64a87d8ee9)

---
 ui/jquery.ui.datepicker.js | 70 ++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 34 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index b07a5ee72..61c2b69b4 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1575,40 +1575,42 @@ $.extend(Datepicker.prototype, {
 		if (!showMonthAfterYear)
 			html += monthHtml + (secondary || !(changeMonth && changeYear) ? '&#xa0;' : '');
 		// year selection
-		inst.yearshtml = '';
-		if (secondary || !changeYear)
-			html += '<span class="ui-datepicker-year">' + drawYear + '</span>';
-		else {
-			// determine range of years to display
-			var years = this._get(inst, 'yearRange').split(':');
-			var thisYear = new Date().getFullYear();
-			var determineYear = function(value) {
-				var year = (value.match(/c[+-].*/) ? drawYear + parseInt(value.substring(1), 10) :
-					(value.match(/[+-].*/) ? thisYear + parseInt(value, 10) :
-					parseInt(value, 10)));
-				return (isNaN(year) ? thisYear : year);
-			};
-			var year = determineYear(years[0]);
-			var endYear = Math.max(year, determineYear(years[1] || ''));
-			year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
-			endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
-			inst.yearshtml += '<select class="ui-datepicker-year" ' +
-				'onchange="DP_jQuery_' + dpuuid + '.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'Y\');" ' +
-				'onclick="DP_jQuery_' + dpuuid + '.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
-				'>';
-			for (; year <= endYear; year++) {
-				inst.yearshtml += '<option value="' + year + '"' +
-					(year == drawYear ? ' selected="selected"' : '') +
-					'>' + year + '</option>';
-			}
-			inst.yearshtml += '</select>';
-			//when showing there is no need for later update
-			if( ! $.browser.mozilla ){
-				html += inst.yearshtml;
-				inst.yearshtml = null;
-			} else {
-				// will be replaced later with inst.yearshtml
-				html += '<select class="ui-datepicker-year"><option value="' + drawYear + '" selected="selected">' + drawYear + '</option></select>';
+		if ( !inst.yearshtml ) {
+			inst.yearshtml = '';
+			if (secondary || !changeYear)
+				html += '<span class="ui-datepicker-year">' + drawYear + '</span>';
+			else {
+				// determine range of years to display
+				var years = this._get(inst, 'yearRange').split(':');
+				var thisYear = new Date().getFullYear();
+				var determineYear = function(value) {
+					var year = (value.match(/c[+-].*/) ? drawYear + parseInt(value.substring(1), 10) :
+						(value.match(/[+-].*/) ? thisYear + parseInt(value, 10) :
+						parseInt(value, 10)));
+					return (isNaN(year) ? thisYear : year);
+				};
+				var year = determineYear(years[0]);
+				var endYear = Math.max(year, determineYear(years[1] || ''));
+				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+				inst.yearshtml += '<select class="ui-datepicker-year" ' +
+					'onchange="DP_jQuery_' + dpuuid + '.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'Y\');" ' +
+					'onclick="DP_jQuery_' + dpuuid + '.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
+					'>';
+				for (; year <= endYear; year++) {
+					inst.yearshtml += '<option value="' + year + '"' +
+						(year == drawYear ? ' selected="selected"' : '') +
+						'>' + year + '</option>';
+				}
+				inst.yearshtml += '</select>';
+				//when showing there is no need for later update
+				if( ! $.browser.mozilla ){
+					html += inst.yearshtml;
+					inst.yearshtml = null;
+				} else {
+					// will be replaced later with inst.yearshtml
+					html += '<select class="ui-datepicker-year"><option value="' + drawYear + '" selected="selected">' + drawYear + '</option></select>';
+				}
 			}
 		}
 		html += this._get(inst, 'yearSuffix');
-- 
cgit v1.2.3


From c205fbc4cc6753a493e1e4f499e3c34431c1b254 Mon Sep 17 00:00:00 2001
From: Richard Worth <rdworth@gmail.com>
Date: Thu, 7 Apr 2011 09:08:48 -0400
Subject: Sortable: Reverted 56b0da59d71396a740cf48a75902243d561ba186 as #4551
 is invalid. (cherry picked from commit
 54016b8469345a325e8c1ab6f8a7d17b0f0f8d01)

---
 tests/visual/sortable/sortable_ticket_4551.html | 54 -------------------------
 ui/jquery.ui.sortable.js                        |  4 ++
 2 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 tests/visual/sortable/sortable_ticket_4551.html

(limited to 'ui')

diff --git a/tests/visual/sortable/sortable_ticket_4551.html b/tests/visual/sortable/sortable_ticket_4551.html
deleted file mode 100644
index 2b83ae42e..000000000
--- a/tests/visual/sortable/sortable_ticket_4551.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="UTF-8" />
-	<title>Sortable Visual Test : Sortable ticket #4551</title>
-	<link rel="stylesheet" href="../visual.css" type="text/css" />
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css">
-	<script type="text/javascript" src="../../../jquery-1.5.1.js"></script>
-	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
-	<script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script>
-	<script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script>
-	<script type="text/javascript">
-	$(function() {
-		$("#first, #second").sortable({
-			connectWith: '.sortable'
-		}).disableSelection();
-	});
-	</script>
-	<style type="text/css">
-		.sortable { margin: 0; padding: 0;  }
-		.sortable div { margin: 3px 3px 3px 0; background: #ccc; padding: 1px; border: 1px solid black; float:left; width: 100px; height: 140px; font-size: 1em; text-align: center; }
-		#second div { background: #acc; }
-	</style>
-</head>
-<body>
-
-<h1 class="ui-widget-header"><a href="http://dev.jqueryui.com/ticket/4551">#4551 - Sortable connectWith fails if item is floated</a></h1>
-
-<div id="first" class="sortable">
-	<div>1</div>
-	<div>2</div>
-	<div>3</div>
-	<div>4</div>
-	<div>5</div>
-	<div>6</div>
-	<div>7</div>
-	<div>8</div>
-	<div>9</div>
-	<div>10</div>
-	<div>11</div>
-	<div>12</div>
-</div>
-
-<br style="clear:both;">
-<hr />
-
-<div id="second" class="sortable">
-	<div>12</div>
-	<div>14</div>
-</div>
-
-</body>
-</html>
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 15b6b8113..aae7c6799 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -615,6 +615,10 @@ $.widget("ui.sortable", $.ui.mouse, {
 		for (var i = this.items.length - 1; i >= 0; i--){
 			var item = this.items[i];
 
+			//We ignore calculating positions of all connected containers when we're not over them
+			if(item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0])
+				continue;
+
 			var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
 
 			if (!fast) {
-- 
cgit v1.2.3


From e388153049503255810d4a871e06e9930de74c70 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 7 Apr 2011 14:06:36 -0400
Subject: Dialog: Don't use .attr( props, true ) for creating buttons since
 that API doesn't exist in jQueery 1.3.2. Fixes #7226 - Dialog buttons badly
 handled with JQuery 1.3.2.

---
 ui/jquery.ui.dialog.js | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index e88679fc7..56af35d41 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -37,6 +37,18 @@ var uiDialogClasses =
 		maxWidth: true,
 		minHeight: true,
 		minWidth: true
+	},
+	// support for jQuery 1.3.2 - handle common attrFn methods for dialog
+	attrFn = $.attrFn || {
+		val: true,
+		css: true,
+		html: true,
+		text: true,
+		data: true,
+		width: true,
+		height: true,
+		offset: true,
+		click: true
 	};
 
 $.widget("ui.dialog", {
@@ -376,12 +388,21 @@ $.widget("ui.dialog", {
 					{ click: props, text: name } :
 					props;
 				var button = $('<button type="button"></button>')
-					.attr( props, true )
-					.unbind('click')
 					.click(function() {
 						props.click.apply(self.element[0], arguments);
 					})
 					.appendTo(uiButtonSet);
+				// can't use .attr( props, true ) with jQuery 1.3.2.
+				$.each( props, function( key, value ) {
+					if ( key === "click" ) {
+						return;
+					}
+					if ( key in attrFn ) {
+						button[ key ]( value );
+					} else {
+						button.attr( key, value );
+					}
+				});
 				if ($.fn.button) {
 					button.button();
 				}
-- 
cgit v1.2.3


From 3c13b33682655be2a2f1c68b45cd500530997c41 Mon Sep 17 00:00:00 2001
From: Kyle Florence <kyle.florence@gmail.com>
Date: Fri, 8 Apr 2011 16:55:14 -0700
Subject: Progressbar: hide valueDiv when value is 0. Fixes #7231 - valueDiv
 should be hidden when value is at 0% (cherry picked from commit
 3b77ac654b079a3098d12cca04d2397bb3863b85)

---
 ui/jquery.ui.progressbar.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui')

diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js
index 70c6e025c..1e6352ab8 100644
--- a/ui/jquery.ui.progressbar.js
+++ b/ui/jquery.ui.progressbar.js
@@ -95,6 +95,7 @@ $.widget( "ui.progressbar", {
 		}
 
 		this.valueDiv
+			.toggle( value > this.min )
 			.toggleClass( "ui-corner-right", value === this.options.max )
 			.width( percentage.toFixed(0) + "%" );
 		this.element.attr( "aria-valuenow", value );
-- 
cgit v1.2.3


From 06815a98b121072ab38b6117652e9a1e31813742 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 15 Apr 2011 00:08:03 -0400
Subject: Datepicker: Fixed dateFormat for nl locale. Fixes #7250 - Datepicker:
 Incorrect dateFormat in jquery.ui.datepicker-nl.js. (cherry picked from
 commit 3af0923b73317750ac7a7e431e3fa515f18e5092)

---
 ui/i18n/jquery.ui.datepicker-nl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/i18n/jquery.ui.datepicker-nl.js b/ui/i18n/jquery.ui.datepicker-nl.js
index 663d6bb26..40be2cfa4 100644
--- a/ui/i18n/jquery.ui.datepicker-nl.js
+++ b/ui/i18n/jquery.ui.datepicker-nl.js
@@ -14,7 +14,7 @@ jQuery(function($){
 		dayNamesShort: ['zon', 'maa', 'din', 'woe', 'don', 'vri', 'zat'],
 		dayNamesMin: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
 		weekHeader: 'Wk',
-		dateFormat: 'dd/mm/yy',
+		dateFormat: 'dd-mm-yy',
 		firstDay: 1,
 		isRTL: false,
 		showMonthAfterYear: false,
-- 
cgit v1.2.3


From df7e3000382e9c1e11659f5a65d43a93cc99c0e9 Mon Sep 17 00:00:00 2001
From: Lopo <lopo@losys.sk>
Date: Tue, 12 Apr 2011 12:43:19 +0200
Subject: Datepicker: Fixed Slovak locale. Fixes #7254 - Datepicker: Incorrect
 day name for Slovak localization. (cherry picked from commit
 59c787fa4a975547e7789928126028bdfe132582)

---
 ui/i18n/jquery.ui.datepicker-sk.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/i18n/jquery.ui.datepicker-sk.js b/ui/i18n/jquery.ui.datepicker-sk.js
index 8a6771c1e..078d1b0fa 100644
--- a/ui/i18n/jquery.ui.datepicker-sk.js
+++ b/ui/i18n/jquery.ui.datepicker-sk.js
@@ -10,7 +10,7 @@ jQuery(function($){
 		'Júl','August','September','Október','November','December'],
 		monthNamesShort: ['Jan','Feb','Mar','Apr','Máj','Jún',
 		'Júl','Aug','Sep','Okt','Nov','Dec'],
-		dayNames: ['Nedel\'a','Pondelok','Utorok','Streda','Štvrtok','Piatok','Sobota'],
+		dayNames: ['Nedeľa','Pondelok','Utorok','Streda','Štvrtok','Piatok','Sobota'],
 		dayNamesShort: ['Ned','Pon','Uto','Str','Štv','Pia','Sob'],
 		dayNamesMin: ['Ne','Po','Ut','St','Št','Pia','So'],
 		weekHeader: 'Ty',
-- 
cgit v1.2.3


From 54399403e76d4fbd17c8f2664e591fd89801fab1 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 27 Apr 2011 10:49:08 -0400
Subject: Class Animation: Use .attr( "class" ) instead of .attr( "className" )
 and adjust the queueing logic for jQuery 1.6 compatibility. Fixes #7275 -
 $.effects.animateClass broken in jQuery 1.6.

---
 ui/jquery.effects.core.js | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index a97ca040d..d9ff4b09b 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -231,12 +231,12 @@ $.effects.animateClass = function(value, duration, easing, callback) {
 		easing = null;
 	}
 
-	return this.queue('fx', function() {
+	return this.queue(function() {
 		var that = $(this),
 			originalStyleAttr = that.attr('style') || ' ',
 			originalStyle = filterStyles(getElementStyles.call(this)),
 			newStyle,
-			className = that.attr('className');
+			className = that.attr('class');
 
 		$.each(classAnimationActions, function(i, action) {
 			if (value[action]) {
@@ -244,28 +244,27 @@ $.effects.animateClass = function(value, duration, easing, callback) {
 			}
 		});
 		newStyle = filterStyles(getElementStyles.call(this));
-		that.attr('className', className);
-
-		that.animate(styleDifference(originalStyle, newStyle), duration, easing, function() {
-			$.each(classAnimationActions, function(i, action) {
-				if (value[action]) { that[action + 'Class'](value[action]); }
-			});
-			// work around bug in IE by clearing the cssText before setting it
-			if (typeof that.attr('style') == 'object') {
-				that.attr('style').cssText = '';
-				that.attr('style').cssText = originalStyleAttr;
-			} else {
-				that.attr('style', originalStyleAttr);
+		that.attr('class', className);
+
+		that.animate(styleDifference(originalStyle, newStyle), {
+			queue: false,
+			duration: duration,
+			easding: easing,
+			complete: function() {
+				$.each(classAnimationActions, function(i, action) {
+					if (value[action]) { that[action + 'Class'](value[action]); }
+				});
+				// work around bug in IE by clearing the cssText before setting it
+				if (typeof that.attr('style') == 'object') {
+					that.attr('style').cssText = '';
+					that.attr('style').cssText = originalStyleAttr;
+				} else {
+					that.attr('style', originalStyleAttr);
+				}
+				if (callback) { callback.apply(this, arguments); }
+				$.dequeue( this );
 			}
-			if (callback) { callback.apply(this, arguments); }
 		});
-
-		// $.animate adds a function to the end of the queue
-		// but we want it at the front
-		var queue = $.queue(this),
-			anim = queue.splice(queue.length - 1, 1)[0];
-		queue.splice(1, 0, anim);
-		$.dequeue(this);
 	});
 };
 
-- 
cgit v1.2.3


From 96f6b1a7db1e3bc74de66153cf9be80152e04430 Mon Sep 17 00:00:00 2001
From: adambaratz <adam.baratz@gmail.com>
Date: Fri, 15 Apr 2011 07:51:56 -0700
Subject: Core: reuse tabindex value. Fixed #7257 - optimize :tabbable. (cherry
 picked from commit fe3b36b8efcabf3d1f1d60523cae87c69a882f27)

---
 ui/jquery.ui.core.js | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js
index 4c1999310..59fa4d73a 100644
--- a/ui/jquery.ui.core.js
+++ b/ui/jquery.ui.core.js
@@ -174,6 +174,27 @@ $.each( [ "Width", "Height" ], function( i, name ) {
 });
 
 // selectors
+function focusable( element, isTabIndexNotNaN ) {
+	var nodeName = element.nodeName.toLowerCase();
+	if ( "area" === nodeName ) {
+		var map = element.parentNode,
+			mapName = map.name,
+			img;
+		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+			return false;
+		}
+		img = $( "img[usemap=#" + mapName + "]" )[0];
+		return !!img && visible( img );
+	}
+	return ( /input|select|textarea|button|object/.test( nodeName )
+		? !element.disabled
+		: "a" == nodeName
+			? element.href || isTabIndexNotNaN
+			: isTabIndexNotNaN)
+		// the element and all of its ancestors must be visible
+		&& visible( element );
+}
+
 function visible( element ) {
 	return !$( element ).parents().andSelf().filter(function() {
 		return $.curCSS( this, "visibility" ) === "hidden" ||
@@ -187,30 +208,13 @@ $.extend( $.expr[ ":" ], {
 	},
 
 	focusable: function( element ) {
-		var nodeName = element.nodeName.toLowerCase(),
-			tabIndex = $.attr( element, "tabindex" );
-		if ( "area" === nodeName ) {
-			var map = element.parentNode,
-				mapName = map.name,
-				img;
-			if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
-				return false;
-			}
-			img = $( "img[usemap=#" + mapName + "]" )[0];
-			return !!img && visible( img );
-		}
-		return ( /input|select|textarea|button|object/.test( nodeName )
-			? !element.disabled
-			: "a" == nodeName
-				? element.href || !isNaN( tabIndex )
-				: !isNaN( tabIndex ))
-			// the element and all of its ancestors must be visible
-			&& visible( element );
+		return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
 	},
 
 	tabbable: function( element ) {
-		var tabIndex = $.attr( element, "tabindex" );
-		return ( isNaN( tabIndex ) || tabIndex >= 0 ) && $( element ).is( ":focusable" );
+		var tabIndex = $.attr( element, "tabindex" ),
+			isTabIndexNaN = isNaN( tabIndex );
+		return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
 	}
 });
 
-- 
cgit v1.2.3


From 0da176b0062f497b13eddcf4c8312f960019f4d3 Mon Sep 17 00:00:00 2001
From: adambaratz <adam.baratz@gmail.com>
Date: Fri, 15 Apr 2011 07:23:46 -0700
Subject: Datepicker: bind hover events using delegate. Fixed #7256 - minimize
 event binding in Datepicker initialization. (cherry picked from commit
 74d195e39681791545b3026a66bfa3f319237e5a)

---
 ui/jquery.ui.datepicker.js | 47 ++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 61c2b69b4..d6419e2e3 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -16,6 +16,7 @@ $.extend($.ui, { datepicker: { version: "@VERSION" } });
 
 var PROP_NAME = 'datepicker';
 var dpuuid = new Date().getTime();
+var instActive;
 
 /* Date picker manager.
    Use the singleton instance of this class, $.datepicker, to interact with the date picker.
@@ -107,7 +108,7 @@ function Datepicker() {
 		autoSize: false // True to size the input for the date format, false to leave as is
 	};
 	$.extend(this._defaults, this.regional['']);
-	this.dpDiv = $('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>');
+	this.dpDiv = bindHover($('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'));
 }
 
 $.extend(Datepicker.prototype, {
@@ -173,7 +174,7 @@ $.extend(Datepicker.prototype, {
 			drawMonth: 0, drawYear: 0, // month being drawn
 			inline: inline, // is datepicker inline or not
 			dpDiv: (!inline ? this.dpDiv : // presentation div
-			$('<div class="' + this._inlineClass + ' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))};
+			bindHover($('<div class="' + this._inlineClass + ' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')))};
 	},
 
 	/* Attach the date picker to an input field. */
@@ -672,29 +673,13 @@ $.extend(Datepicker.prototype, {
 	_updateDatepicker: function(inst) {
 		var self = this;
 		var borders = $.datepicker._getBorders(inst.dpDiv);
+		instActive = inst; // for delegate hover events
 		inst.dpDiv.empty().append(this._generateHTML(inst));
 		var cover = inst.dpDiv.find('iframe.ui-datepicker-cover'); // IE6- only
 		if( !!cover.length ){ //avoid call to outerXXXX() when not in IE6
 			cover.css({left: -borders[0], top: -borders[1], width: inst.dpDiv.outerWidth(), height: inst.dpDiv.outerHeight()})
 		}
-		inst.dpDiv.find('button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a')
-				.bind('mouseout', function(){
-					$(this).removeClass('ui-state-hover');
-					if(this.className.indexOf('ui-datepicker-prev') != -1) $(this).removeClass('ui-datepicker-prev-hover');
-					if(this.className.indexOf('ui-datepicker-next') != -1) $(this).removeClass('ui-datepicker-next-hover');
-				})
-				.bind('mouseover', function(){
-					if (!self._isDisabledDatepicker( inst.inline ? inst.dpDiv.parent()[0] : inst.input[0])) {
-						$(this).parents('.ui-datepicker-calendar').find('a').removeClass('ui-state-hover');
-						$(this).addClass('ui-state-hover');
-						if(this.className.indexOf('ui-datepicker-prev') != -1) $(this).addClass('ui-datepicker-prev-hover');
-						if(this.className.indexOf('ui-datepicker-next') != -1) $(this).addClass('ui-datepicker-next-hover');
-					}
-				})
-			.end()
-			.find('.' + this._dayOverClass + ' a')
-				.trigger('mouseover')
-			.end();
+		inst.dpDiv.find('.' + this._dayOverClass + ' a').mouseover();
 		var numMonths = this._getNumberOfMonths(inst);
 		var cols = numMonths[1];
 		var width = 17;
@@ -1715,6 +1700,28 @@ $.extend(Datepicker.prototype, {
 	}
 });
 
+/*
+ * Bind hover events for datepicker elements.
+ * Done via delegate so the binding only occurs once in the lifetime of the parent div.
+ * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
+ */ 
+function bindHover(dpDiv) {
+	var selector = 'button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a';
+	return dpDiv.delegate(selector, 'mouseout', function() {
+			$(this).removeClass('ui-state-hover');
+			if (this.className.indexOf('ui-datepicker-prev') != -1) $(this).removeClass('ui-datepicker-prev-hover');
+			if (this.className.indexOf('ui-datepicker-next') != -1) $(this).removeClass('ui-datepicker-next-hover');
+		})
+		.delegate(selector, 'mouseover', function(){
+			if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) {
+				$(this).parents('.ui-datepicker-calendar').find('a').removeClass('ui-state-hover');
+				$(this).addClass('ui-state-hover');
+				if (this.className.indexOf('ui-datepicker-prev') != -1) $(this).addClass('ui-datepicker-prev-hover');
+				if (this.className.indexOf('ui-datepicker-next') != -1) $(this).addClass('ui-datepicker-next-hover');
+			}
+		});
+}
+
 /* jQuery extend now ignores nulls! */
 function extendRemove(target, props) {
 	$.extend(target, props);
-- 
cgit v1.2.3


From a6d8fd1480d1d020a32cad015b43689fdefec352 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Thu, 28 Apr 2011 10:43:02 -0400
Subject: Draggable: containment now updates dynamically to handle scrolling
 container. Fixed #4445 containment ignored when scrolling in overflow div
 (cherry picked from commit d62074961171ea00deaae34890b78f917d21bf68)

---
 ui/jquery.ui.draggable.js | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index d27255cac..8958e49cf 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -342,16 +342,19 @@ $.widget("ui.draggable", $.ui.mouse, {
 		];
 
 		if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor != Array) {
-			var ce = $(o.containment)[0]; if(!ce) return;
-			var co = $(o.containment).offset();
+		        var c = $(o.containment);
+			var ce = c[0]; if(!ce) return;
+			var co = c.offset();
 			var over = ($(ce).css("overflow") != 'hidden');
 
 			this.containment = [
-				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
-				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0),
-				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
-				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top  - this.margins.bottom
+				(parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
+				(parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0),
+				(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
+				(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top  - this.margins.bottom
 			];
+			this.relative_container = c;
+
 		} else if(o.containment.constructor == Array) {
 			this.containment = o.containment;
 		}
@@ -393,20 +396,31 @@ $.widget("ui.draggable", $.ui.mouse, {
 		 */
 
 		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
-
-			if(this.containment) {
-				if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
-				if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
+		         var containment;
+		         if(this.containment) {
+				 if (this.relative_container){
+				     var co = this.relative_container.offset();
+				     containment = [ this.containment[0] + co.left,
+						     this.containment[1] + co.top,
+						     this.containment[2] + co.left,
+						     this.containment[3] + co.top ];
+				 }
+				 else {
+				     containment = this.containment;
+				 }
+
+				if(event.pageX - this.offset.click.left < containment[0]) pageX = containment[0] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top < containment[1]) pageY = containment[1] + this.offset.click.top;
+				if(event.pageX - this.offset.click.left > containment[2]) pageX = containment[2] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top > containment[3]) pageY = containment[3] + this.offset.click.top;
 			}
 
 			if(o.grid) {
 				var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
-				pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+				pageY = containment ? (!(top - this.offset.click.top < containment[1] || top - this.offset.click.top > containment[3]) ? top : (!(top - this.offset.click.top < containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
 
 				var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
-				pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+				pageX = containment ? (!(left - this.offset.click.left < containment[0] || left - this.offset.click.left > containment[2]) ? left : (!(left - this.offset.click.left < containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
 			}
 
 		}
-- 
cgit v1.2.3


From f3737a91835f6b35b49a5b821e7cc555340c6057 Mon Sep 17 00:00:00 2001
From: whittet <whittet@gmail.com>
Date: Wed, 27 Apr 2011 07:21:29 -0700
Subject: Bug fix for another use case, see comment by whittet here:
 http://bugs.jqueryui.com/ticket/6702 (cherry picked from commit
 2bf061ea6fd3bad7d6f5a77eebb22b7cc07140e4)

---
 ui/jquery.ui.sortable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index aae7c6799..91a42658f 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -50,7 +50,7 @@ $.widget("ui.sortable", $.ui.mouse, {
 		this.refresh();
 
 		//Let's determine if the items are being displayed horizontally
-		this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
+		this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
 
 		//Let's determine the parent's offset
 		this.offset = this.element.offset();
-- 
cgit v1.2.3


From 15b9e9d176a7796f1582ba5c0a7d06e4ad7cc8e9 Mon Sep 17 00:00:00 2001
From: Mark Johnson <virgofx@live.com>
Date: Tue, 19 Apr 2011 14:39:58 -0700
Subject: Draggable: Modified the iframe shims to load prior to dragging. Fixed
 #7270. (cherry picked from commit b1c8a13a1669dca4c4bde97fe2cc8b76f661b432)

---
 ui/jquery.ui.draggable.js | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 8958e49cf..cf08e4798 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -79,6 +79,16 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this.handle = this._getHandle(event);
 		if (!this.handle)
 			return false;
+		
+		$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
+			$('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>')
+			.css({
+				width: this.offsetWidth+"px", height: this.offsetHeight+"px",
+				position: "absolute", opacity: "0.001", zIndex: 1000
+			})
+			.css($(this).offset())
+			.appendTo("body");
+		});
 
 		return true;
 
@@ -212,6 +222,16 @@ $.widget("ui.draggable", $.ui.mouse, {
 		return false;
 	},
 	
+	_mouseUp: function(event) {
+		if (this.options.iframeFix === true) {
+			$("div.ui-draggable-iframeFix").each(function() { 
+				this.parentNode.removeChild(this); 
+			}); //Remove frame helpers
+		}
+		
+		return $.ui.mouse.prototype._mouseUp.call(this, event);
+	},
+	
 	cancel: function() {
 		
 		if(this.helper.is(".ui-draggable-dragging")) {
@@ -630,24 +650,6 @@ $.ui.plugin.add("draggable", "cursor", {
 	}
 });
 
-$.ui.plugin.add("draggable", "iframeFix", {
-	start: function(event, ui) {
-		var o = $(this).data('draggable').options;
-		$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
-			$('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>')
-			.css({
-				width: this.offsetWidth+"px", height: this.offsetHeight+"px",
-				position: "absolute", opacity: "0.001", zIndex: 1000
-			})
-			.css($(this).offset())
-			.appendTo("body");
-		});
-	},
-	stop: function(event, ui) {
-		$("div.ui-draggable-iframeFix").each(function() { this.parentNode.removeChild(this); }); //Remove frame helpers
-	}
-});
-
 $.ui.plugin.add("draggable", "opacity", {
 	start: function(event, ui) {
 		var t = $(ui.helper), o = $(this).data('draggable').options;
-- 
cgit v1.2.3


From 0d0addee1621f231a6f8b9bc33c087f70cd5628b Mon Sep 17 00:00:00 2001
From: Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
Date: Thu, 5 May 2011 05:29:13 +0900
Subject: Datepicker: Remove BOM. Fixed #6734 - Datepicker i18n: Problem with
 JavascriptPacker. (cherry picked from commit
 f505de68fd7a0f8be70b0ccf97bb9b75b610d8e6)

---
 ui/i18n/jquery.ui.datepicker-af.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-ar.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-az.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-bg.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-bs.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-cs.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-da.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-de.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-el.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-en-GB.js | 2 +-
 ui/i18n/jquery.ui.datepicker-eo.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-et.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-eu.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-fa.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-fo.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-fr-CH.js | 2 +-
 ui/i18n/jquery.ui.datepicker-fr.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-he.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-hr.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-ja.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-ml.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-nl.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-ro.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-sq.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-sr-SR.js | 2 +-
 ui/i18n/jquery.ui.datepicker-sr.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-sv.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-ta.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-th.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-vi.js    | 2 +-
 ui/i18n/jquery.ui.datepicker-zh-TW.js | 2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'ui')

diff --git a/ui/i18n/jquery.ui.datepicker-af.js b/ui/i18n/jquery.ui.datepicker-af.js
index 43fbf6cd8..0922ef7a1 100644
--- a/ui/i18n/jquery.ui.datepicker-af.js
+++ b/ui/i18n/jquery.ui.datepicker-af.js
@@ -1,4 +1,4 @@
-/* Afrikaans initialisation for the jQuery UI date picker plugin. */
+/* Afrikaans initialisation for the jQuery UI date picker plugin. */
 /* Written by Renier Pretorius. */
 jQuery(function($){
 	$.datepicker.regional['af'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-ar.js b/ui/i18n/jquery.ui.datepicker-ar.js
index cfa6632b4..743a15db0 100644
--- a/ui/i18n/jquery.ui.datepicker-ar.js
+++ b/ui/i18n/jquery.ui.datepicker-ar.js
@@ -1,4 +1,4 @@
-/* Arabic Translation for jQuery UI date picker plugin. */
+/* Arabic Translation for jQuery UI date picker plugin. */
 /* Khaled Alhourani -- me@khaledalhourani.com */
 /* NOTE: monthNames are the original months names and they are the Arabic names, not the new months name فبراير - يناير and there isn't any Arabic roots for these months */
 jQuery(function($){
diff --git a/ui/i18n/jquery.ui.datepicker-az.js b/ui/i18n/jquery.ui.datepicker-az.js
index b5434057b..57802a40b 100644
--- a/ui/i18n/jquery.ui.datepicker-az.js
+++ b/ui/i18n/jquery.ui.datepicker-az.js
@@ -1,4 +1,4 @@
-/* Azerbaijani (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Azerbaijani (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Jamil Najafov (necefov33@gmail.com). */
 jQuery(function($) {
 	$.datepicker.regional['az'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-bg.js b/ui/i18n/jquery.ui.datepicker-bg.js
index b5113f781..c19d20fb1 100644
--- a/ui/i18n/jquery.ui.datepicker-bg.js
+++ b/ui/i18n/jquery.ui.datepicker-bg.js
@@ -1,4 +1,4 @@
-/* Bulgarian initialisation for the jQuery UI date picker plugin. */
+/* Bulgarian initialisation for the jQuery UI date picker plugin. */
 /* Written by Stoyan Kyosev (http://svest.org). */
 jQuery(function($){
     $.datepicker.regional['bg'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-bs.js b/ui/i18n/jquery.ui.datepicker-bs.js
index 30ab826b0..d4dc8b0ec 100644
--- a/ui/i18n/jquery.ui.datepicker-bs.js
+++ b/ui/i18n/jquery.ui.datepicker-bs.js
@@ -1,4 +1,4 @@
-/* Bosnian i18n for the jQuery UI date picker plugin. */
+/* Bosnian i18n for the jQuery UI date picker plugin. */
 /* Written by Kenan Konjo. */
 jQuery(function($){
 	$.datepicker.regional['bs'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-cs.js b/ui/i18n/jquery.ui.datepicker-cs.js
index c3c07ea67..9805bcdb8 100644
--- a/ui/i18n/jquery.ui.datepicker-cs.js
+++ b/ui/i18n/jquery.ui.datepicker-cs.js
@@ -1,4 +1,4 @@
-/* Czech initialisation for the jQuery UI date picker plugin. */
+/* Czech initialisation for the jQuery UI date picker plugin. */
 /* Written by Tomas Muller (tomas@tomas-muller.net). */
 jQuery(function($){
 	$.datepicker.regional['cs'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-da.js b/ui/i18n/jquery.ui.datepicker-da.js
index 4a99a5833..176044e18 100644
--- a/ui/i18n/jquery.ui.datepicker-da.js
+++ b/ui/i18n/jquery.ui.datepicker-da.js
@@ -1,4 +1,4 @@
-/* Danish initialisation for the jQuery UI date picker plugin. */
+/* Danish initialisation for the jQuery UI date picker plugin. */
 /* Written by Jan Christensen ( deletestuff@gmail.com). */
 jQuery(function($){
     $.datepicker.regional['da'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-de.js b/ui/i18n/jquery.ui.datepicker-de.js
index ac2d516aa..166f53716 100644
--- a/ui/i18n/jquery.ui.datepicker-de.js
+++ b/ui/i18n/jquery.ui.datepicker-de.js
@@ -1,4 +1,4 @@
-/* German initialisation for the jQuery UI date picker plugin. */
+/* German initialisation for the jQuery UI date picker plugin. */
 /* Written by Milian Wolff (mail@milianw.de). */
 jQuery(function($){
 	$.datepicker.regional['de'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-el.js b/ui/i18n/jquery.ui.datepicker-el.js
index 9542769d9..6d775f995 100644
--- a/ui/i18n/jquery.ui.datepicker-el.js
+++ b/ui/i18n/jquery.ui.datepicker-el.js
@@ -1,4 +1,4 @@
-/* Greek (el) initialisation for the jQuery UI date picker plugin. */
+/* Greek (el) initialisation for the jQuery UI date picker plugin. */
 /* Written by Alex Cicovic (http://www.alexcicovic.com) */
 jQuery(function($){
 	$.datepicker.regional['el'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-en-GB.js b/ui/i18n/jquery.ui.datepicker-en-GB.js
index aac7b6195..16a096e75 100644
--- a/ui/i18n/jquery.ui.datepicker-en-GB.js
+++ b/ui/i18n/jquery.ui.datepicker-en-GB.js
@@ -1,4 +1,4 @@
-/* English/UK initialisation for the jQuery UI date picker plugin. */
+/* English/UK initialisation for the jQuery UI date picker plugin. */
 /* Written by Stuart. */
 jQuery(function($){
 	$.datepicker.regional['en-GB'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-eo.js b/ui/i18n/jquery.ui.datepicker-eo.js
index ba5715687..6cabc2c46 100644
--- a/ui/i18n/jquery.ui.datepicker-eo.js
+++ b/ui/i18n/jquery.ui.datepicker-eo.js
@@ -1,4 +1,4 @@
-/* Esperanto initialisation for the jQuery UI date picker plugin. */
+/* Esperanto initialisation for the jQuery UI date picker plugin. */
 /* Written by Olivier M. (olivierweb@ifrance.com). */
 jQuery(function($){
 	$.datepicker.regional['eo'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-et.js b/ui/i18n/jquery.ui.datepicker-et.js
index f97311f31..92f81f637 100644
--- a/ui/i18n/jquery.ui.datepicker-et.js
+++ b/ui/i18n/jquery.ui.datepicker-et.js
@@ -1,4 +1,4 @@
-/* Estonian initialisation for the jQuery UI date picker plugin. */
+/* Estonian initialisation for the jQuery UI date picker plugin. */
 /* Written by Mart Sõmermaa (mrts.pydev at gmail com). */
 jQuery(function($){
 	$.datepicker.regional['et'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-eu.js b/ui/i18n/jquery.ui.datepicker-eu.js
index 9ba6ee22e..bee4bfba2 100644
--- a/ui/i18n/jquery.ui.datepicker-eu.js
+++ b/ui/i18n/jquery.ui.datepicker-eu.js
@@ -1,4 +1,4 @@
-/* Euskarako oinarria 'UI date picker' jquery-ko extentsioarentzat */
+/* Euskarako oinarria 'UI date picker' jquery-ko extentsioarentzat */
 /* Karrikas-ek itzulia (karrikas@karrikas.com) */
 jQuery(function($){
 	$.datepicker.regional['eu'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-fa.js b/ui/i18n/jquery.ui.datepicker-fa.js
index adb3709fe..81de4da4a 100644
--- a/ui/i18n/jquery.ui.datepicker-fa.js
+++ b/ui/i18n/jquery.ui.datepicker-fa.js
@@ -1,4 +1,4 @@
-/* Persian (Farsi) Translation for the jQuery UI date picker plugin. */
+/* Persian (Farsi) Translation for the jQuery UI date picker plugin. */
 /* Javad Mowlanezhad -- jmowla@gmail.com */
 /* Jalali calendar should supported soon! (Its implemented but I have to test it) */
 jQuery(function($) {
diff --git a/ui/i18n/jquery.ui.datepicker-fo.js b/ui/i18n/jquery.ui.datepicker-fo.js
index c14362216..8a6cb99cb 100644
--- a/ui/i18n/jquery.ui.datepicker-fo.js
+++ b/ui/i18n/jquery.ui.datepicker-fo.js
@@ -1,4 +1,4 @@
-/* Faroese initialisation for the jQuery UI date picker plugin */
+/* Faroese initialisation for the jQuery UI date picker plugin */
 /* Written by Sverri Mohr Olsen, sverrimo@gmail.com */
 jQuery(function($){
 	$.datepicker.regional['fo'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-fr-CH.js b/ui/i18n/jquery.ui.datepicker-fr-CH.js
index 38212d548..244eacff4 100644
--- a/ui/i18n/jquery.ui.datepicker-fr-CH.js
+++ b/ui/i18n/jquery.ui.datepicker-fr-CH.js
@@ -1,4 +1,4 @@
-/* Swiss-French initialisation for the jQuery UI date picker plugin. */
+/* Swiss-French initialisation for the jQuery UI date picker plugin. */
 /* Written Martin Voelkle (martin.voelkle@e-tc.ch). */
 jQuery(function($){
 	$.datepicker.regional['fr-CH'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-fr.js b/ui/i18n/jquery.ui.datepicker-fr.js
index 74ea1c231..7e793639f 100644
--- a/ui/i18n/jquery.ui.datepicker-fr.js
+++ b/ui/i18n/jquery.ui.datepicker-fr.js
@@ -1,4 +1,4 @@
-/* French initialisation for the jQuery UI date picker plugin. */
+/* French initialisation for the jQuery UI date picker plugin. */
 /* Written by Keith Wood (kbwood{at}iinet.com.au),
               Stéphane Nahmani (sholby@sholby.net),
               Stéphane Raimbault <stephane.raimbault@gmail.com> */
diff --git a/ui/i18n/jquery.ui.datepicker-he.js b/ui/i18n/jquery.ui.datepicker-he.js
index 3b3dc387f..88a786689 100644
--- a/ui/i18n/jquery.ui.datepicker-he.js
+++ b/ui/i18n/jquery.ui.datepicker-he.js
@@ -1,4 +1,4 @@
-/* Hebrew initialisation for the UI Datepicker extension. */
+/* Hebrew initialisation for the UI Datepicker extension. */
 /* Written by Amir Hardon (ahardon at gmail dot com). */
 jQuery(function($){
 	$.datepicker.regional['he'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-hr.js b/ui/i18n/jquery.ui.datepicker-hr.js
index 0285c1aa9..1eb3dd926 100644
--- a/ui/i18n/jquery.ui.datepicker-hr.js
+++ b/ui/i18n/jquery.ui.datepicker-hr.js
@@ -1,4 +1,4 @@
-/* Croatian i18n for the jQuery UI date picker plugin. */
+/* Croatian i18n for the jQuery UI date picker plugin. */
 /* Written by Vjekoslav Nesek. */
 jQuery(function($){
 	$.datepicker.regional['hr'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-ja.js b/ui/i18n/jquery.ui.datepicker-ja.js
index 79cd827c7..7eb4268d4 100644
--- a/ui/i18n/jquery.ui.datepicker-ja.js
+++ b/ui/i18n/jquery.ui.datepicker-ja.js
@@ -1,4 +1,4 @@
-/* Japanese initialisation for the jQuery UI date picker plugin. */
+/* Japanese initialisation for the jQuery UI date picker plugin. */
 /* Written by Kentaro SATO (kentaro@ranvis.com). */
 jQuery(function($){
 	$.datepicker.regional['ja'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-ml.js b/ui/i18n/jquery.ui.datepicker-ml.js
index 753dba411..1e3432c0a 100644
--- a/ui/i18n/jquery.ui.datepicker-ml.js
+++ b/ui/i18n/jquery.ui.datepicker-ml.js
@@ -1,4 +1,4 @@
-/* Malayalam (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Malayalam (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Saji Nediyanchath (saji89@gmail.com). */
 jQuery(function($){
 	$.datepicker.regional['ml'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-nl.js b/ui/i18n/jquery.ui.datepicker-nl.js
index 40be2cfa4..09634088b 100644
--- a/ui/i18n/jquery.ui.datepicker-nl.js
+++ b/ui/i18n/jquery.ui.datepicker-nl.js
@@ -1,4 +1,4 @@
-/* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by Mathias Bynens <http://mathiasbynens.be/> */
 jQuery(function($){
 	$.datepicker.regional.nl = {
diff --git a/ui/i18n/jquery.ui.datepicker-ro.js b/ui/i18n/jquery.ui.datepicker-ro.js
index 4fe95aeac..6b140aff6 100644
--- a/ui/i18n/jquery.ui.datepicker-ro.js
+++ b/ui/i18n/jquery.ui.datepicker-ro.js
@@ -1,4 +1,4 @@
-/* Romanian initialisation for the jQuery UI date picker plugin.
+/* Romanian initialisation for the jQuery UI date picker plugin.
  *
  * Written by Edmond L. (ll_edmond@walla.com)
  * and Ionut G. Stan (ionut.g.stan@gmail.com)
diff --git a/ui/i18n/jquery.ui.datepicker-sq.js b/ui/i18n/jquery.ui.datepicker-sq.js
index be84104c0..21974c56c 100644
--- a/ui/i18n/jquery.ui.datepicker-sq.js
+++ b/ui/i18n/jquery.ui.datepicker-sq.js
@@ -1,4 +1,4 @@
-/* Albanian initialisation for the jQuery UI date picker plugin. */
+/* Albanian initialisation for the jQuery UI date picker plugin. */
 /* Written by Flakron Bytyqi (flakron@gmail.com). */
 jQuery(function($){
 	$.datepicker.regional['sq'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-sr-SR.js b/ui/i18n/jquery.ui.datepicker-sr-SR.js
index 8f8ea5e63..e7a8683e4 100644
--- a/ui/i18n/jquery.ui.datepicker-sr-SR.js
+++ b/ui/i18n/jquery.ui.datepicker-sr-SR.js
@@ -1,4 +1,4 @@
-/* Serbian i18n for the jQuery UI date picker plugin. */
+/* Serbian i18n for the jQuery UI date picker plugin. */
 /* Written by Dejan Dimić. */
 jQuery(function($){
 	$.datepicker.regional['sr-SR'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-sr.js b/ui/i18n/jquery.ui.datepicker-sr.js
index 49c9b4a30..0bd240e69 100644
--- a/ui/i18n/jquery.ui.datepicker-sr.js
+++ b/ui/i18n/jquery.ui.datepicker-sr.js
@@ -1,4 +1,4 @@
-/* Serbian i18n for the jQuery UI date picker plugin. */
+/* Serbian i18n for the jQuery UI date picker plugin. */
 /* Written by Dejan Dimić. */
 jQuery(function($){
 	$.datepicker.regional['sr'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-sv.js b/ui/i18n/jquery.ui.datepicker-sv.js
index 8236b62b5..e5f549fbf 100644
--- a/ui/i18n/jquery.ui.datepicker-sv.js
+++ b/ui/i18n/jquery.ui.datepicker-sv.js
@@ -1,4 +1,4 @@
-/* Swedish initialisation for the jQuery UI date picker plugin. */
+/* Swedish initialisation for the jQuery UI date picker plugin. */
 /* Written by Anders Ekdahl ( anders@nomadiz.se). */
 jQuery(function($){
     $.datepicker.regional['sv'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-ta.js b/ui/i18n/jquery.ui.datepicker-ta.js
index 91116d387..40431ed8e 100644
--- a/ui/i18n/jquery.ui.datepicker-ta.js
+++ b/ui/i18n/jquery.ui.datepicker-ta.js
@@ -1,4 +1,4 @@
-/* Tamil (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Tamil (UTF-8) initialisation for the jQuery UI date picker plugin. */
 /* Written by S A Sureshkumar (saskumar@live.com). */
 jQuery(function($){
 	$.datepicker.regional['ta'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-th.js b/ui/i18n/jquery.ui.datepicker-th.js
index c090c6b81..2e5300cfd 100644
--- a/ui/i18n/jquery.ui.datepicker-th.js
+++ b/ui/i18n/jquery.ui.datepicker-th.js
@@ -1,4 +1,4 @@
-/* Thai initialisation for the jQuery UI date picker plugin. */
+/* Thai initialisation for the jQuery UI date picker plugin. */
 /* Written by pipo (pipo@sixhead.com). */
 jQuery(function($){
 	$.datepicker.regional['th'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-vi.js b/ui/i18n/jquery.ui.datepicker-vi.js
index 9813a59e0..1d8f7bbd9 100644
--- a/ui/i18n/jquery.ui.datepicker-vi.js
+++ b/ui/i18n/jquery.ui.datepicker-vi.js
@@ -1,4 +1,4 @@
-/* Vietnamese initialisation for the jQuery UI date picker plugin. */
+/* Vietnamese initialisation for the jQuery UI date picker plugin. */
 /* Translated by Le Thanh Huy (lthanhhuy@cit.ctu.edu.vn). */
 jQuery(function($){
 	$.datepicker.regional['vi'] = {
diff --git a/ui/i18n/jquery.ui.datepicker-zh-TW.js b/ui/i18n/jquery.ui.datepicker-zh-TW.js
index d211573c6..dd51e359c 100644
--- a/ui/i18n/jquery.ui.datepicker-zh-TW.js
+++ b/ui/i18n/jquery.ui.datepicker-zh-TW.js
@@ -1,4 +1,4 @@
-/* Chinese initialisation for the jQuery UI date picker plugin. */
+/* Chinese initialisation for the jQuery UI date picker plugin. */
 /* Written by Ressol (ressol@gmail.com). */
 jQuery(function($){
 	$.datepicker.regional['zh-TW'] = {
-- 
cgit v1.2.3


From f9faa0ab5fb2b9f332de93fd9d8fb97e9957ff6d Mon Sep 17 00:00:00 2001
From: Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
Date: Thu, 5 May 2011 05:06:27 +0900
Subject: Datepicker: Greedy matching in month name. Fixed #7062 -
 $.datepicker.parseDate does not work for some locale date strings. (cherry
 picked from commit a891e81e06c7ce491ae9058aea2fa7fbd51eddb6)

---
 tests/unit/datepicker/datepicker.html       |  1 +
 tests/unit/datepicker/datepicker_options.js |  4 ++++
 ui/jquery.ui.datepicker.js                  | 24 +++++++++++++++++-------
 3 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'ui')

diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index d3c6f0676..db1f0a55f 100644
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -12,6 +12,7 @@
 	<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
 	<script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-fr.js"></script>
 	<script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-he.js"></script>
+	<script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-zh-CN.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
 	<script type="text/javascript" src="../../../external/qunit.js"></script>
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index 33b07d694..b14c87b8b 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -827,6 +827,10 @@ test('parseDate', function() {
 	equalsDate($.datepicker.parseDate('\'jour\' d \'de\' MM (\'\'DD\'\'), yy',
 		'jour 9 de Avril (\'Lundi\'), 2001', settings), new Date(2001, 4 - 1, 9),
 		'Parse date \'jour\' d \'de\' MM (\'\'DD\'\'), yy with settings');
+
+	var zh = $.datepicker.regional['zh-CN'];
+	equalsDate($.datepicker.parseDate('yy M d', '2011 十一 22', zh),
+		new Date(2011, 11 - 1, 22), 'Parse date yy M d with zh-CN');
 });
 
 test('parseDateErrors', function() {
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index d6419e2e3..fe24d695a 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -992,14 +992,24 @@ $.extend(Datepicker.prototype, {
 		};
 		// Extract a name from the string value and convert to an index
 		var getName = function(match, shortNames, longNames) {
-			var names = (lookAhead(match) ? longNames : shortNames);
-			for (var i = 0; i < names.length; i++) {
-				if (value.substr(iValue, names[i].length).toLowerCase() == names[i].toLowerCase()) {
-					iValue += names[i].length;
-					return i + 1;
+			var names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
+				return [ [k, v] ];
+			}).sort(function (a, b) {
+				return -(a[1].length - b[1].length);
+			});
+			var index = -1;
+			$.each(names, function (i, pair) {
+				var name = pair[1];
+				if (value.substr(iValue, name.length).toLowerCase() == name.toLowerCase()) {
+					index = pair[0];
+					iValue += name.length;
+					return false;
 				}
-			}
-			throw 'Unknown name at position ' + iValue;
+			});
+			if (index != -1)
+				return index + 1;
+			else
+				throw 'Unknown name at position ' + iValue;
 		};
 		// Confirm that a literal character matches the string value
 		var checkLiteral = function() {
-- 
cgit v1.2.3


From 870977ae6b314cecb27a7bfe18b0fdf46c8e9f79 Mon Sep 17 00:00:00 2001
From: Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
Date: Thu, 5 May 2011 04:07:43 +0900
Subject: Datepicker: Remove old "ui-datepicker-multi-N" before add new one.
 Fixed #6704 - Display overflow when multiple datepickers have different
 numberOfMonths. (cherry picked from commit
 fc97ccd398b60525fd9e4c0e9aa1f51048984394)

---
 tests/unit/datepicker/datepicker_core.js | 8 ++++++++
 ui/jquery.ui.datepicker.js               | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js
index 2730ec861..3cb4a2f50 100644
--- a/tests/unit/datepicker/datepicker_core.js
+++ b/tests/unit/datepicker/datepicker_core.js
@@ -121,8 +121,16 @@ test('baseStructure', function() {
 	ok(child.is('div.ui-datepicker-group') && child.is('div.ui-datepicker-group-last'), 'Structure multi [2] - second month division');
 	child = dp.children(':eq(2)');
 	ok(child.is('div.ui-datepicker-row-break'), 'Structure multi [2] - row break');
+	ok(dp.is('.ui-datepicker-multi-2'), 'Structure multi [2] - multi-2');
 	inp.datepicker('hide').datepicker('destroy');
 	
+	// Multi-month 3
+	inp = init('#inp', {numberOfMonths: 3});
+	inp.focus();
+	ok(dp.is('.ui-datepicker-multi-3'), 'Structure multi [3] - multi-3');
+	ok(! dp.is('.ui-datepicker-multi-2'), 'Structure multi [3] - Trac #6704');
+	inp.datepicker('hide').datepicker('destroy');
+
 	// Multi-month [2, 2]
 	inp = init('#inp', {numberOfMonths: [2, 2]});
 	inp.focus();
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index fe24d695a..2ab23a6eb 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -683,10 +683,9 @@ $.extend(Datepicker.prototype, {
 		var numMonths = this._getNumberOfMonths(inst);
 		var cols = numMonths[1];
 		var width = 17;
+		inst.dpDiv.removeClass('ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4').width('');
 		if (cols > 1)
 			inst.dpDiv.addClass('ui-datepicker-multi-' + cols).css('width', (width * cols) + 'em');
-		else
-			inst.dpDiv.removeClass('ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4').width('');
 		inst.dpDiv[(numMonths[0] != 1 || numMonths[1] != 1 ? 'add' : 'remove') +
 			'Class']('ui-datepicker-multi');
 		inst.dpDiv[(this._get(inst, 'isRTL') ? 'add' : 'remove') +
-- 
cgit v1.2.3


From 4c218eeb0a4e6b06d055fcfe0b45ff034ecbfa43 Mon Sep 17 00:00:00 2001
From: Eike Send <eike.send@gmail.com>
Date: Thu, 5 May 2011 14:45:06 +0200
Subject: Button: stop disabled button from firing click events. fixes #5945.
 Behavior was inconsisten between BUTTON and A elements. (cherry picked from
 commit a7f1659cdc99222a733ed2edbd7d00dc57c30227)

---
 ui/jquery.ui.button.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ui')

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index a98e96f46..bc8357c08 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -102,6 +102,11 @@ $.widget( "ui.button", {
 			})
 			.bind( "blur.button", function() {
 				$( this ).removeClass( focusClass );
+			})
+			.bind( "click.button", function( event ) {
+				if ( options.disabled ) {
+					event.stopImmediatePropagation();
+				}
 			});
 
 		if ( toggleButton ) {
-- 
cgit v1.2.3


From 73602652acd6908acaad27c29a5e3562e7538b5b Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 6 May 2011 13:31:43 -0400
Subject: Datepicker: Moved the setting of  _datepickerShowing to after
 postProcess to prevent being able to tab away leaving the datepicker open.
 Fixed #6775 - DatePicker remains open when tabbing out

---
 ui/jquery.ui.datepicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 2ab23a6eb..06d49304a 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -648,7 +648,6 @@ $.extend(Datepicker.prototype, {
 			var showAnim = $.datepicker._get(inst, 'showAnim');
 			var duration = $.datepicker._get(inst, 'duration');
 			var postProcess = function() {
-				$.datepicker._datepickerShowing = true;
 				var cover = inst.dpDiv.find('iframe.ui-datepicker-cover'); // IE6- only
 				if( !! cover.length ){
 					var borders = $.datepicker._getBorders(inst.dpDiv);
@@ -657,6 +656,7 @@ $.extend(Datepicker.prototype, {
 				}
 			};
 			inst.dpDiv.zIndex($(input).zIndex()+1);
+			$.datepicker._datepickerShowing = true;
 			if ($.effects && $.effects[showAnim])
 				inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
 			else
-- 
cgit v1.2.3


From 7eda94a8c916760de4093df85f58cc694838b52b Mon Sep 17 00:00:00 2001
From: kborchers <k_borchers@yahoo.com>
Date: Mon, 9 May 2011 11:43:45 -0500
Subject: Mouse: Changed mouseHandled check to a local var rather than using
 originalEvent. Fixed #4333 - Nested draggables problem in IE (cherry picked
 from commit 9c50bdfde0260fc8412eec1c5020ed6b61558ebd)

---
 ui/jquery.ui.mouse.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index bfe4a7578..0bd38db85 100644
--- a/ui/jquery.ui.mouse.js
+++ b/ui/jquery.ui.mouse.js
@@ -12,6 +12,11 @@
  */
 (function( $, undefined ) {
 
+var mouseHandled = false;
+$(document).mousedown(function(e) {
+	mouseHandled = false;
+});
+
 $.widget("ui.mouse", {
 	options: {
 		cancel: ':input,option',
@@ -44,9 +49,7 @@ $.widget("ui.mouse", {
 
 	_mouseDown: function(event) {
 		// don't let more than one widget handle mouseStart
-		// TODO: figure out why we have to use originalEvent
-		event.originalEvent = event.originalEvent || {};
-		if (event.originalEvent.mouseHandled) { return; }
+		if(mouseHandled) {return};
 
 		// we may have missed mouseup (out of window)
 		(this._mouseStarted && this._mouseUp(event));
@@ -92,7 +95,8 @@ $.widget("ui.mouse", {
 			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
 
 		event.preventDefault();
-		event.originalEvent.mouseHandled = true;
+		
+		mouseHandled = true;
 		return true;
 	},
 
-- 
cgit v1.2.3


From 38af07ec4e916bc5fe1268b9878a21801368a78d Mon Sep 17 00:00:00 2001
From: Carson McDonald <carson@ioncannon.net>
Date: Mon, 9 May 2011 11:00:12 -0400
Subject: Resizable: Skip autohide hover action when resizable is disabled. Fix
 #6948 - Resizable autoHide Doesn't Work With Resizable's disable (cherry
 picked from commit 0e2bc5efe217681c006ae7a16be21520e6563da6)

---
 ui/jquery.ui.resizable.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ui')

diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index 1e1706a9d..e0579ef84 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -176,10 +176,12 @@ $.widget("ui.resizable", $.ui.mouse, {
 			$(this.element)
 				.addClass("ui-resizable-autohide")
 				.hover(function() {
+					if (o.disabled) return;
 					$(this).removeClass("ui-resizable-autohide");
 					self._handles.show();
 				},
 				function(){
+					if (o.disabled) return;
 					if (!self.resizing) {
 						$(this).addClass("ui-resizable-autohide");
 						self._handles.hide();
-- 
cgit v1.2.3


From 36110e07d471ee0d59d9ac5b5077deda7005d155 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 11 May 2011 08:40:16 -0400
Subject: Autocomplete: Use appropriate methods for getting scroll values for
 .prop()/.attr() compat. Fixes #7354 - Autocomplete: Scrollable results don't
 visually update with jQuery 1.6.

---
 ui/jquery.ui.autocomplete.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index dfe3fa3f3..62fb782df 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -490,12 +490,12 @@ $.widget("ui.menu", {
 		this.deactivate();
 		if (this.hasScroll()) {
 			var offset = item.offset().top - this.element.offset().top,
-				scroll = this.element.attr("scrollTop"),
+				scroll = this.element.scrollTop(),
 				elementHeight = this.element.height();
 			if (offset < 0) {
-				this.element.attr("scrollTop", scroll + offset);
+				this.element.scrollTop( scroll + offset);
 			} else if (offset >= elementHeight) {
-				this.element.attr("scrollTop", scroll + offset - elementHeight + item.height());
+				this.element.scrollTop( scroll + offset - elementHeight + item.height());
 			}
 		}
 		this.active = item.eq(0)
@@ -601,7 +601,7 @@ $.widget("ui.menu", {
 	},
 
 	hasScroll: function() {
-		return this.element.height() < this.element.attr("scrollHeight");
+		return this.element.height() < this.element[ $.fn.prop ? "prop" : "attr" ]("scrollHeight");
 	},
 
 	select: function( event ) {
-- 
cgit v1.2.3


From 5e1032ec74feba976c91de275605174c87710a6a Mon Sep 17 00:00:00 2001
From: Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
Date: Sat, 7 May 2011 06:32:13 +0900
Subject: Datepicker: Fixed #7043 - Using multiple months always renders 6 rows
 of dates even if only 5 are needed. (cherry picked from commit
 ac459ff7df4904cb8601d4efb95107177ecb40e0)

---
 ui/jquery.ui.datepicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 06d49304a..549b49267 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1485,7 +1485,7 @@ $.extend(Datepicker.prototype, {
 				if (drawYear == inst.selectedYear && drawMonth == inst.selectedMonth)
 					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
 				var leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
-				var numRows = (isMultiMonth ? 6 : Math.ceil((leadDays + daysInMonth) / 7)); // calculate the number of rows to generate
+				var numRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
 				var printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
 				for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows
 					calender += '<tr>';
-- 
cgit v1.2.3


From 201b5ed48c0b848a38e8e43c4f187c44e2e16ddd Mon Sep 17 00:00:00 2001
From: Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
Date: Wed, 11 May 2011 13:06:53 -0400
Subject: Draggable: Remove id when cloning helpers. Fixes #4564 -
 Draggable+Sortable Demo duplicates DOM Ids. (cherry picked from commit
 98fcb477d6a7091b21e9b7bc0b8c28f798954d47)

---
 ui/jquery.ui.draggable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index cf08e4798..26468b489 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -261,7 +261,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 	_createHelper: function(event) {
 
 		var o = this.options;
-		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper == 'clone' ? this.element.clone() : this.element);
+		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper == 'clone' ? this.element.clone().removeAttr('id') : this.element);
 
 		if(!helper.parents('body').length)
 			helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
@@ -580,7 +580,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
 					//Now we fake the start of dragging for the sortable instance,
 					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
 					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
-					this.instance.currentItem = $(self).clone().appendTo(this.instance.element).data("sortable-item", true);
+					this.instance.currentItem = $(self).clone().removeAttr('id').appendTo(this.instance.element).data("sortable-item", true);
 					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
 					this.instance.options.helper = function() { return ui.helper[0]; };
 
-- 
cgit v1.2.3


From 03ce9fb8cd3d81227dcaf878f8cea5540bbd868a Mon Sep 17 00:00:00 2001
From: Adam Baratz <adam.baratz@gmail.com>
Date: Wed, 11 May 2011 13:13:09 -0400
Subject: Slider: add handles in single DOM operation. Fixed #7259 - optimize
 handle creation. (cherry picked from commit
 7fb6ca146e06b6e750f799937264a38a54ceaa64)

---
 ui/jquery.ui.slider.js | 50 ++++++++++++++++----------------------------------
 1 file changed, 16 insertions(+), 34 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index a32e77966..ea93c3e1c 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -36,7 +36,11 @@ $.widget( "ui.slider", $.ui.mouse, {
 
 	_create: function() {
 		var self = this,
-			o = this.options;
+			o = this.options,
+			existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
+			handle = "<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",
+			handleCount = ( o.values && o.values.length ) || 1,
+			handles = [];
 
 		this._keySliding = false;
 		this._mouseSliding = false;
@@ -50,57 +54,35 @@ $.widget( "ui.slider", $.ui.mouse, {
 				" ui-slider-" + this.orientation +
 				" ui-widget" +
 				" ui-widget-content" +
-				" ui-corner-all" );
-		
-		if ( o.disabled ) {
-			this.element.addClass( "ui-slider-disabled ui-disabled" );
-		}
+				" ui-corner-all" +
+				( o.disabled ? " ui-slider-disabled ui-disabled" : "" ) );
 
 		this.range = $([]);
 
 		if ( o.range ) {
 			if ( o.range === true ) {
-				this.range = $( "<div></div>" );
 				if ( !o.values ) {
 					o.values = [ this._valueMin(), this._valueMin() ];
 				}
 				if ( o.values.length && o.values.length !== 2 ) {
 					o.values = [ o.values[0], o.values[0] ];
 				}
-			} else {
-				this.range = $( "<div></div>" );
-			}
-
-			this.range
-				.appendTo( this.element )
-				.addClass( "ui-slider-range" );
-
-			if ( o.range === "min" || o.range === "max" ) {
-				this.range.addClass( "ui-slider-range-" + o.range );
 			}
 
-			// note: this isn't the most fittingly semantic framework class for this element,
-			// but worked best visually with a variety of themes
-			this.range.addClass( "ui-widget-header" );
-		}
-
-		if ( $( ".ui-slider-handle", this.element ).length === 0 ) {
-			$( "<a href='#'></a>" )
+			this.range = $( "<div></div>" )
 				.appendTo( this.element )
-				.addClass( "ui-slider-handle" );
+				.addClass( "ui-slider-range" +
+				// note: this isn't the most fittingly semantic framework class for this element,
+				// but worked best visually with a variety of themes
+				" ui-widget-header" + 
+				( ( o.range === "min" || o.range === "max" ) ? " ui-slider-range-" + o.range : "" ) );
 		}
 
-		if ( o.values && o.values.length ) {
-			while ( $(".ui-slider-handle", this.element).length < o.values.length ) {
-				$( "<a href='#'></a>" )
-					.appendTo( this.element )
-					.addClass( "ui-slider-handle" );
-			}
+		for ( var i = existingHandles.length; i < handleCount; i += 1 ) {
+			handles.push( handle );
 		}
 
-		this.handles = $( ".ui-slider-handle", this.element )
-			.addClass( "ui-state-default" +
-				" ui-corner-all" );
+		this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( self.element ) );
 
 		this.handle = this.handles.eq( 0 );
 
-- 
cgit v1.2.3


From 3edda96f2a65a5c9544eab2b736dcd8b84edd8db Mon Sep 17 00:00:00 2001
From: Garrison Locke <gplocke@gmail.com>
Date: Wed, 11 May 2011 14:20:28 -0400
Subject: Datepicker: Removed duplicate call to _updateDatepicker when changing
 option in Firefox. Fixed #7322 - datepicker: Year would disappear when
 changing option. (cherry picked from commit
 a645630ebaf02febb19a5c9e28f1e46401f07ed0)

---
 ui/jquery.ui.datepicker.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 549b49267..3e98dd6f4 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -455,7 +455,8 @@ $.extend(Datepicker.prototype, {
 				inst.settings.maxDate = this._formatDate(inst, maxDate);
 			this._attachments($(target), inst);
 			this._autoSize(inst);
-			this._setDateDatepicker(target, date);
+			this._setDate(inst, date);
+			this._updateAlternate(inst);
 			this._updateDatepicker(inst);
 		}
 	},
-- 
cgit v1.2.3


From 2b84107b3149631f6f09b69af9bc3a61be32b7c2 Mon Sep 17 00:00:00 2001
From: Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
Date: Sat, 7 May 2011 04:28:19 +0900
Subject: Datepicker: Disabled datepicker should disable own select element
 too. Fixed #6850 - Disable datepicker should disable month and year
 dropdowns. (cherry picked from commit
 4585182c703ba93e0cbb059319862c53e177f836)

---
 tests/unit/datepicker/datepicker_methods.js | 5 ++++-
 ui/jquery.ui.datepicker.js                  | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/tests/unit/datepicker/datepicker_methods.js b/tests/unit/datepicker/datepicker_methods.js
index c102f7ac3..ee14f353b 100644
--- a/tests/unit/datepicker/datepicker_methods.js
+++ b/tests/unit/datepicker/datepicker_methods.js
@@ -107,16 +107,19 @@ test('enableDisable', function() {
 	ok(inp.next('img').css('opacity') == 1, 'Enable/disable image - image now enabled');
 	inp.datepicker('destroy');
 	// Inline
-	var inl = init('#inl');
+	var inl = init('#inl', {changeYear: true});
 	var dp = $('.ui-datepicker-inline', inl);
 	ok(!inl.datepicker('isDisabled'), 'Enable/disable inline - initially marked as enabled');
 	ok(!dp.children().is('.ui-state-disabled'), 'Enable/disable inline - not visually disabled initially');
+	ok(!dp.find('select').attr('disabled'), 'Enable/disable inline - form element enabled initially');
 	inl.datepicker('disable');
 	ok(inl.datepicker('isDisabled'), 'Enable/disable inline - now marked as disabled');
 	ok(dp.children().is('.ui-state-disabled'), 'Enable/disable inline - visually disabled');
+	ok(dp.find('select').attr('disabled'), 'Enable/disable inline - form element disabled');
 	inl.datepicker('enable');
 	ok(!inl.datepicker('isDisabled'), 'Enable/disable inline - now marked as enabled');
 	ok(!dp.children().is('.ui-state-disabled'), 'Enable/disable inline - not visiually disabled');
+	ok(!dp.find('select').attr('disabled'), 'Enable/disable inline - form element enabled');
 	inl.datepicker('destroy');
 });
 
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 3e98dd6f4..419e6b84b 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -364,6 +364,8 @@ $.extend(Datepicker.prototype, {
 		else if (nodeName == 'div' || nodeName == 'span') {
 			var inline = $target.children('.' + this._inlineClass);
 			inline.children().removeClass('ui-state-disabled');
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				removeAttr("disabled");
 		}
 		this._disabledInputs = $.map(this._disabledInputs,
 			function(value) { return (value == target ? null : value); }); // delete entry
@@ -387,6 +389,8 @@ $.extend(Datepicker.prototype, {
 		else if (nodeName == 'div' || nodeName == 'span') {
 			var inline = $target.children('.' + this._inlineClass);
 			inline.children().addClass('ui-state-disabled');
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				attr("disabled", "disabled");
 		}
 		this._disabledInputs = $.map(this._disabledInputs,
 			function(value) { return (value == target ? null : value); }); // delete entry
-- 
cgit v1.2.3


From 804ba0a2df3a98db5929474daa3f664b7a3d5f29 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 12 May 2011 08:18:06 -0400
Subject: Revert "Datepicker: Fixed #7043 - Using multiple months always
 renders 6 rows of dates even if only 5 are needed."

This reverts commit 5e1032ec74feba976c91de275605174c87710a6a.
---
 ui/jquery.ui.datepicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 419e6b84b..996528937 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1490,7 +1490,7 @@ $.extend(Datepicker.prototype, {
 				if (drawYear == inst.selectedYear && drawMonth == inst.selectedMonth)
 					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
 				var leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
-				var numRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
+				var numRows = (isMultiMonth ? 6 : Math.ceil((leadDays + daysInMonth) / 7)); // calculate the number of rows to generate
 				var printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
 				for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows
 					calender += '<tr>';
-- 
cgit v1.2.3


From 10fa7f9ae9ea68ac11795862a2ccdc813256eb8e Mon Sep 17 00:00:00 2001
From: Andrew Powell <andrew@shellcape.org>
Date: Thu, 12 May 2011 11:28:37 -0400
Subject: Datepicker: removed conditional mozilla browser check block. Fixes
 #7322 - Year selector disappears after setting an option in Firefox (cherry
 picked from commit a6227be2c09da2c698ee6d5251ac113b90585522)

---
 ui/jquery.ui.datepicker.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 996528937..93d468c36 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -705,7 +705,7 @@ $.extend(Datepicker.prototype, {
 			var origyearshtml = inst.yearshtml;
 			setTimeout(function(){
 				//assure that inst.yearshtml didn't change.
-				if( origyearshtml === inst.yearshtml ){
+				if( origyearshtml === inst.yearshtml && inst.yearshtml ){
 					inst.dpDiv.find('select.ui-datepicker-year:first').replaceWith(inst.yearshtml);
 				}
 				origyearshtml = inst.yearshtml = null;
@@ -1602,14 +1602,9 @@ $.extend(Datepicker.prototype, {
 						'>' + year + '</option>';
 				}
 				inst.yearshtml += '</select>';
-				//when showing there is no need for later update
-				if( ! $.browser.mozilla ){
-					html += inst.yearshtml;
-					inst.yearshtml = null;
-				} else {
-					// will be replaced later with inst.yearshtml
-					html += '<select class="ui-datepicker-year"><option value="' + drawYear + '" selected="selected">' + drawYear + '</option></select>';
-				}
+				
+				html += inst.yearshtml;
+				inst.yearshtml = null;
 			}
 		}
 		html += this._get(inst, 'yearSuffix');
-- 
cgit v1.2.3