From b8ad711deedab11da1f181b486ee67f259a3ef7c Mon Sep 17 00:00:00 2001
From: kborchers <kris.borchers@gmail.com>
Date: Thu, 12 Jul 2012 22:45:56 -0500
Subject: Menu: Add a flag and remove previous attempt to prevent select events
 from being fired by click events bubbling up through nested menus

---
 ui/jquery.ui.menu.js | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 81fef2e7c..e8b8ed1fc 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -15,7 +15,7 @@
  */
 (function( $, undefined ) {
 
-var currentEventTarget = null;
+var mouseHandled = false;
 
 $.widget( "ui.menu", {
 	version: "@VERSION",
@@ -73,24 +73,16 @@ $.widget( "ui.menu", {
 			},
 			"click .ui-menu-item:has(a)": function( event ) {
 				var target = $( event.target );
-				if ( target[0] !== currentEventTarget ) {
-					currentEventTarget = target[0];
-					// TODO: What are we trying to accomplish with this check?
-					// Clicking a menu item twice results in a select event with
-					// an empty ui.item.
-					target.one( "click" + this.eventNamespace, function( event ) {
-						currentEventTarget = null;
-					});
-					// Don't select disabled menu items
-					if ( !target.closest( ".ui-menu-item" ).is( ".ui-state-disabled" ) ) {
-						this.select( event );
-						// Redirect focus to the menu with a delay for firefox
-						this._delay(function() {
-							if ( !this.element.is(":focus") ) {
-								this.element.focus();
-							}
-						}, 20 );
-					}
+				if ( !mouseHandled && target.closest( ".ui-menu-item" ).not( ".ui-state-disabled" ).length ) {
+					mouseHandled = true;
+
+					this.select( event );
+					// Redirect focus to the menu with a delay for firefox
+					this._delay(function() {
+						if ( !this.element.is(":focus") ) {
+							this.element.focus();
+						}
+					}, 20 );
 				}
 			},
 			"mouseenter .ui-menu-item": function( event ) {
@@ -127,6 +119,9 @@ $.widget( "ui.menu", {
 				if ( !$( event.target ).closest( ".ui-menu" ).length ) {
 					this.collapseAll( event );
 				}
+
+				// Reset the mouseHandled flag
+				mouseHandled = false;
 			}
 		});
 	},
@@ -166,9 +161,6 @@ $.widget( "ui.menu", {
 
 		// Destroy menu dividers
 		this.element.find( ".ui-menu-divider" ).removeClass( "ui-menu-divider ui-widget-content" );
-
-		// Unbind currentEventTarget click event handler
-		this._off( $( currentEventTarget ), "click" );
 	},
 
 	_keydown: function( event ) {
-- 
cgit v1.2.3


From be0be892d3a2658f1f4518a7d3346ef356aa89c6 Mon Sep 17 00:00:00 2001
From: kborchers <kris.borchers@gmail.com>
Date: Thu, 12 Jul 2012 23:01:13 -0500
Subject: Menu: Fix issue with missing active item when clicking a menu item
 more than once

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

(limited to 'ui')

diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index e8b8ed1fc..be04fff1c 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -583,7 +583,8 @@ $.widget( "ui.menu", {
 	select: function( event ) {
 		// Save active reference before collapseAll triggers blur
 		var ui = {
-			item: this.active
+			// Selecting a menu item removes the active item causing multiple clicks to be missing an item
+			item: this.active || $( event.target ).closest( ".ui-menu-item" )
 		};
 		this.collapseAll( event, true );
 		this._trigger( "select", event, ui );
-- 
cgit v1.2.3


From 5eb1aeec4ebba7f1366f355331664098e42dfe49 Mon Sep 17 00:00:00 2001
From: kborchers <kris.borchers@gmail.com>
Date: Fri, 13 Jul 2012 13:36:00 -0500
Subject: Menu: Remove unnecessary click delay and change focus delay for AT to
 the default delay

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

(limited to 'ui')

diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index be04fff1c..75cfac40b 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -77,12 +77,10 @@ $.widget( "ui.menu", {
 					mouseHandled = true;
 
 					this.select( event );
-					// Redirect focus to the menu with a delay for firefox
-					this._delay(function() {
-						if ( !this.element.is(":focus") ) {
-							this.element.focus();
-						}
-					}, 20 );
+					// Redirect focus to the menu
+					if ( !this.element.is(":focus") ) {
+						this.element.focus();
+					}
 				}
 			},
 			"mouseenter .ui-menu-item": function( event ) {
@@ -488,7 +486,7 @@ $.widget( "ui.menu", {
 			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
 			this._delay(function() {
 				this.focus( event, newItem );
-			}, 20 );
+			});
 		}
 	},
 
-- 
cgit v1.2.3


From dcea4f043adc7f37674feead31ded148d311ab72 Mon Sep 17 00:00:00 2001
From: Baoju Yuan <the_guy_1987@hotmail.com>
Date: Mon, 16 Jul 2012 10:26:02 -0400
Subject: Sortable: Reset fromOutside property when canceling helper removal.
 Fixes #8430 - draggable with sortable makes sortable event receive triggered
 wrong.

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

(limited to 'ui')

diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 7e5875200..db24fed38 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -1030,6 +1030,8 @@ $.widget("ui.sortable", $.ui.mouse, {
 				for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
 				this._trigger("stop", event, this._uiHash());
 			}
+
+			this.fromOutside = false;
 			return false;
 		}
 
-- 
cgit v1.2.3


From b4ef2f7ebb1162f75d8fa3276d73e4746bcace84 Mon Sep 17 00:00:00 2001
From: Maciej Mroziński <mrozik87@gmail.com>
Date: Mon, 16 Jul 2012 13:09:52 +0200
Subject: Datepicker: Modified _updateDatepicker to not update display if
 updated instance is not current instance. Fixed #6814 - datepicker('setDate')
 incorrectly overwrites current display with two datepickers.

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

(limited to 'ui')

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 06db79ba7..4c260a1c8 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -708,6 +708,9 @@ $.extend(Datepicker.prototype, {
 
 	/* Generate the date picker content. */
 	_updateDatepicker: function(inst) {
+		if ($.datepicker._curInst && inst != $.datepicker._curInst) {
+			return;
+		}
 		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
 		var borders = $.datepicker._getBorders(inst.dpDiv);
 		instActive = inst; // for delegate hover events
-- 
cgit v1.2.3


From cb44dc6c2840a77fbb13a398910ca8818d6439e3 Mon Sep 17 00:00:00 2001
From: Maciej Mroziński <mrozik87@gmail.com>
Date: Tue, 17 Jul 2012 16:16:27 -0400
Subject: Datepicker: Deleted z-index style on hidden input. Fixed #7449 -
 Datepicker dialog has a negative z-index.

---
 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 4c260a1c8..1b80e3bdb 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -309,7 +309,7 @@ $.extend(Datepicker.prototype, {
 			this.uuid += 1;
 			var id = 'dp' + this.uuid;
 			this._dialogInput = $('<input type="text" id="' + id +
-				'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');
+				'" style="position: absolute; top: -100px; width: 0px;"/>');
 			this._dialogInput.keydown(this._doKeyDown);
 			$('body').append(this._dialogInput);
 			inst = this._dialogInst = this._newInst(this._dialogInput, false);
-- 
cgit v1.2.3


From 147ec7bd624e631fe019973876ad587e85d112bf Mon Sep 17 00:00:00 2001
From: Luis Dalmolin <luis.nh@gmail.com>
Date: Mon, 16 Jul 2012 09:54:48 -0300
Subject: Datepicker: Fixed position problem when input is in a fixed element.
 Fixes #5626 - DatePicker doesn't work inside fixed div.

---
 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 1b80e3bdb..692832d19 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -766,8 +766,8 @@ $.extend(Datepicker.prototype, {
 		var dpHeight = inst.dpDiv.outerHeight();
 		var inputWidth = inst.input ? inst.input.outerWidth() : 0;
 		var inputHeight = inst.input ? inst.input.outerHeight() : 0;
-		var viewWidth = document.documentElement.clientWidth + $(document).scrollLeft();
-		var viewHeight = document.documentElement.clientHeight + $(document).scrollTop();
+		var viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft());
+		var viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
 
 		offset.left -= (this._get(inst, 'isRTL') ? (dpWidth - inputWidth) : 0);
 		offset.left -= (isFixed && offset.left == inst.input.offset().left) ? $(document).scrollLeft() : 0;
-- 
cgit v1.2.3


From 4e3d31e1eeabaf311552b8496936122dae88b69f Mon Sep 17 00:00:00 2001
From: Corey Frang <gnarf@gnarf.net>
Date: Fri, 20 Jul 2012 18:07:45 -0500
Subject: Effects: Fixing call to outerHeight/Width in drop effect for compat
 with 1.8 core

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

(limited to 'ui')

diff --git a/ui/jquery.ui.effect-drop.js b/ui/jquery.ui.effect-drop.js
index 3246c09b0..674ef41ec 100644
--- a/ui/jquery.ui.effect-drop.js
+++ b/ui/jquery.ui.effect-drop.js
@@ -32,7 +32,7 @@ $.effects.effect.drop = function( o, done ) {
 	el.show();
 	$.effects.createWrapper( el );
 
-	distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]({ margin: true }) / 2;
+	distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]( true ) / 2;
 
 	if ( show ) {
 		el
-- 
cgit v1.2.3


From 85d259483ebf9a9fddc3c3fb6b191f10d181a1ad Mon Sep 17 00:00:00 2001
From: Corey Frang <gnarf@gnarf.net>
Date: Fri, 20 Jul 2012 18:35:32 -0500
Subject: Effects: Fixing bug in blind effect caused by 48659c64 - auto doesn't
 parse

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

(limited to 'ui')

diff --git a/ui/jquery.ui.effect-blind.js b/ui/jquery.ui.effect-blind.js
index 7cc353525..a5c41325c 100644
--- a/ui/jquery.ui.effect-blind.js
+++ b/ui/jquery.ui.effect-blind.js
@@ -42,7 +42,7 @@ $.effects.effect.blind = function( o, done ) {
 	});
 
 	distance = wrapper[ ref ]();
-	margin = parseFloat( wrapper.css( ref2 ) );
+	margin = parseFloat( wrapper.css( ref2 ) ) || 0;
 
 	animation[ ref ] = show ? distance : 0;
 	if ( !motion ) {
@@ -51,7 +51,7 @@ $.effects.effect.blind = function( o, done ) {
 			.css( vertical ? "top" : "left", "auto" )
 			.css({ position: "absolute" });
 
-	animation[ ref2 ] = show ? margin : distance + margin;
+		animation[ ref2 ] = show ? margin : distance + margin;
 	}
 
 	// start at 0 if we are showing
-- 
cgit v1.2.3


From ed64ccfef4e39ca21152c42e75a5614e2488ae3f Mon Sep 17 00:00:00 2001
From: Corey Frang <gnarf@gnarf.net>
Date: Fri, 20 Jul 2012 18:50:34 -0500
Subject: Effects: Fixing call to outerHeight/Width in slide effect for compat
 with 1.8 core

---
 ui/jquery.ui.effect-slide.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.effect-slide.js b/ui/jquery.ui.effect-slide.js
index d61047b8b..134b058c7 100644
--- a/ui/jquery.ui.effect-slide.js
+++ b/ui/jquery.ui.effect-slide.js
@@ -29,9 +29,7 @@ $.effects.effect.slide = function( o, done ) {
 	// Adjust
 	$.effects.save( el, props );
 	el.show();
-	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]({
-		margin: true
-	});
+	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true );
 
 	$.effects.createWrapper( el ).css({
 		overflow: "hidden"
-- 
cgit v1.2.3


From 1626c97caa920d72d0bb7501b240e64538ed41cd Mon Sep 17 00:00:00 2001
From: Mark Aaron Shirley <maspwr@gmail.com>
Date: Fri, 27 Jul 2012 09:40:11 -0700
Subject: Datepicker: Changed body selector to document.body. Fixed #8464 -
 Datepicker does not properly scope the body selector.

---
 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 692832d19..d54c4fb85 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1818,7 +1818,7 @@ $.fn.datepicker = function(options){
 	/* Initialise the date picker. */
 	if (!$.datepicker.initialized) {
 		$(document).mousedown($.datepicker._checkExternalClick).
-			find('body').append($.datepicker.dpDiv);
+			find(document.body).append($.datepicker.dpDiv);
 		$.datepicker.initialized = true;
 	}
 
-- 
cgit v1.2.3


From b68b116adfd48378f1dd6d5b6f0d437a6e8e2d2e Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 30 Jul 2012 12:48:47 -0400
Subject: Autocomplete: Fixed spacing.

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

(limited to 'ui')

diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 25d909f8d..6a16c576e 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -577,7 +577,7 @@ $.widget( "ui.autocomplete", $.ui.autocomplete, {
 	options: {
 		messages: {
 			noResults: "No search results.",
-			results: function(amount) {
+			results: function( amount ) {
 				return amount + ( amount > 1 ? " results are" : " result is" ) +
 					" available, use up and down arrow keys to navigate.";
 			}
@@ -587,7 +587,7 @@ $.widget( "ui.autocomplete", $.ui.autocomplete, {
 	__response: function( content ) {
 		var message;
 		this._superApply( arguments );
-		if ( this.options.disabled || this.cancelSearch) {
+		if ( this.options.disabled || this.cancelSearch ) {
 			return;
 		}
 		if ( content && content.length ) {
-- 
cgit v1.2.3


From 7e1cb95d379c95ec412dccf6bc1b4e75dd203951 Mon Sep 17 00:00:00 2001
From: kborchers <kris.borchers@gmail.com>
Date: Tue, 31 Jul 2012 00:00:07 -0500
Subject: Menu: Open submenu on click of parent item and only close menu when
 clicking item without submenu.

---
 ui/jquery.ui.menu.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 75cfac40b..055b13319 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -77,8 +77,11 @@ $.widget( "ui.menu", {
 					mouseHandled = true;
 
 					this.select( event );
-					// Redirect focus to the menu
-					if ( !this.element.is(":focus") ) {
+					// Open submenu on click
+					if ( this.element.has( ".ui-menu" ).length ) {
+						this.expand( event );
+					} else if ( !this.element.is(":focus") ) {
+						// Redirect focus to the menu
 						this.element.focus();
 					}
 				}
@@ -584,7 +587,9 @@ $.widget( "ui.menu", {
 			// Selecting a menu item removes the active item causing multiple clicks to be missing an item
 			item: this.active || $( event.target ).closest( ".ui-menu-item" )
 		};
-		this.collapseAll( event, true );
+		if ( !ui.item.has( ".ui-menu" ).length ) {
+			this.collapseAll( event, true );
+		}
 		this._trigger( "select", event, ui );
 	}
 });
-- 
cgit v1.2.3


From e68bee9b84b16ee8a757a7a1f44d93f4ba78c656 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 31 Jul 2012 16:27:43 -0400
Subject: Mouse: Don't try to unbind delegated event handlers if they don't
 exist. Fixes #8416 - Draggable breaks during drag if any other draggable is
 removed or destroyed.

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

(limited to 'ui')

diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index 6f95765f2..dc10d9401 100644
--- a/ui/jquery.ui.mouse.js
+++ b/ui/jquery.ui.mouse.js
@@ -47,9 +47,11 @@ $.widget("ui.mouse", {
 	// other instances of mouse
 	_mouseDestroy: function() {
 		this.element.unbind('.'+this.widgetName);
-		$(document)
-			.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
-			.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+		if ( this._mouseMoveDelegate ) {
+			$(document)
+				.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+				.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+		}
 	},
 
 	_mouseDown: function(event) {
-- 
cgit v1.2.3


From 485ca7192ac57d018b8ce4f03e7dec6e694a53b7 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 9 Aug 2012 10:13:24 -0400
Subject: Simplify licensing.

---
 GPL-LICENSE.txt                        | 278 ---------------------------------
 grunt.js                               |   5 +-
 package.json                           |   8 +-
 tests/jquery.simulate.js               |   2 +-
 themes/base/jquery.ui.accordion.css    |   2 +-
 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.menu.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.spinner.css      |   2 +-
 themes/base/jquery.ui.tabs.css         |   2 +-
 themes/base/jquery.ui.theme.css        |   2 +-
 themes/base/jquery.ui.tooltip.css      |   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.effect-blind.js           |   2 +-
 ui/jquery.ui.effect-bounce.js          |   2 +-
 ui/jquery.ui.effect-clip.js            |   2 +-
 ui/jquery.ui.effect-drop.js            |   2 +-
 ui/jquery.ui.effect-explode.js         |   2 +-
 ui/jquery.ui.effect-fade.js            |   2 +-
 ui/jquery.ui.effect-fold.js            |   2 +-
 ui/jquery.ui.effect-highlight.js       |   2 +-
 ui/jquery.ui.effect-pulsate.js         |   2 +-
 ui/jquery.ui.effect-scale.js           |   2 +-
 ui/jquery.ui.effect-shake.js           |   2 +-
 ui/jquery.ui.effect-slide.js           |   2 +-
 ui/jquery.ui.effect-transfer.js        |   2 +-
 ui/jquery.ui.effect.js                 |   2 +-
 ui/jquery.ui.menu.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.spinner.js                |   2 +-
 ui/jquery.ui.tabs.js                   |   2 +-
 ui/jquery.ui.tooltip.js                |   2 +-
 ui/jquery.ui.widget.js                 |   2 +-
 55 files changed, 55 insertions(+), 340 deletions(-)
 delete mode 100644 GPL-LICENSE.txt

(limited to 'ui')

diff --git a/GPL-LICENSE.txt b/GPL-LICENSE.txt
deleted file mode 100644
index 11dddd00e..000000000
--- a/GPL-LICENSE.txt
+++ /dev/null
@@ -1,278 +0,0 @@
-        GNU GENERAL PUBLIC LICENSE
-           Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-          Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-        GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-          NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
diff --git a/grunt.js b/grunt.js
index 1dc102a9d..d244e21cc 100644
--- a/grunt.js
+++ b/grunt.js
@@ -114,7 +114,7 @@ function createBanner( files ) {
 		"<%= grunt.template.today('isoDate') %>\n" +
 		"<%= pkg.homepage ? '* ' + pkg.homepage + '\n' : '' %>" +
 		"* Includes: " + (files ? fileNames.join(", ") : "<%= stripDirectory(grunt.task.current.file.src[1]) %>") + "\n" +
-		"* Copyright (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
+		"* Copyright <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
 		" Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */";
 }
 
@@ -158,7 +158,6 @@ grunt.initConfig({
 		dist: {
 			src: [
 				"AUTHORS.txt",
-				"GPL-LICENSE.txt",
 				"jquery-*.js",
 				"MIT-LICENSE.txt",
 				"README.md",
@@ -204,7 +203,6 @@ grunt.initConfig({
 		cdn: {
 			src: [
 				"AUTHORS.txt",
-				"GPL-LICENSE.txt",
 				"MIT-LICENSE.txt",
 				"ui/*.js",
 				"package.json"
@@ -247,7 +245,6 @@ grunt.initConfig({
 		themes: {
 			src: [
 				"AUTHORS.txt",
-				"GPL-LICENSE.txt",
 				"MIT-LICENSE.txt",
 				"package.json"
 			],
diff --git a/package.json b/package.json
index 1f3205192..ca71cae2c 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 	"homepage": "http://jqueryui.com",
 	"author": {
 		"name": "jQuery Foundation and other contributors",
-		"url": "http://jqueryui.com"
+		"url": "https://github.com/jquery/jquery-ui/blob/master/AUTHORS.txt"
 	},
 	"maintainers": [
 		{
@@ -43,11 +43,7 @@
 	"licenses": [
 		{
 			"type": "MIT",
-			"url": "http://www.opensource.org/licenses/MIT"
-		},
-		{
-			"type": "GPL",
-			"url": "http://www.opensource.org/licenses/GPL-2.0"
+			"url": "https://github.com/jquery/jquery-ui/blob/master/MIT-LICENSE.txt"
 		}
 	],
 	"dependencies": {},
diff --git a/tests/jquery.simulate.js b/tests/jquery.simulate.js
index 874d274cc..e281e2fee 100644
--- a/tests/jquery.simulate.js
+++ b/tests/jquery.simulate.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  */
 
diff --git a/themes/base/jquery.ui.accordion.css b/themes/base/jquery.ui.accordion.css
index 71319ac28..60975acc2 100644
--- a/themes/base/jquery.ui.accordion.css
+++ b/themes/base/jquery.ui.accordion.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Accordion#theming
diff --git a/themes/base/jquery.ui.all.css b/themes/base/jquery.ui.all.css
index 958dac4be..c92e2a5e7 100644
--- a/themes/base/jquery.ui.all.css
+++ b/themes/base/jquery.ui.all.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Theming
diff --git a/themes/base/jquery.ui.autocomplete.css b/themes/base/jquery.ui.autocomplete.css
index e1b127470..cc85c5a4e 100644
--- a/themes/base/jquery.ui.autocomplete.css
+++ b/themes/base/jquery.ui.autocomplete.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Autocomplete#theming
diff --git a/themes/base/jquery.ui.base.css b/themes/base/jquery.ui.base.css
index 36a5dd274..b1f3d5448 100644
--- a/themes/base/jquery.ui.base.css
+++ b/themes/base/jquery.ui.base.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Theming
diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css
index f5453fb9f..1faeff6ab 100644
--- a/themes/base/jquery.ui.button.css
+++ b/themes/base/jquery.ui.button.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Button#theming
diff --git a/themes/base/jquery.ui.core.css b/themes/base/jquery.ui.core.css
index 33a6c96be..8cf4d02ef 100644
--- a/themes/base/jquery.ui.core.css
+++ b/themes/base/jquery.ui.core.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Theming/API
diff --git a/themes/base/jquery.ui.datepicker.css b/themes/base/jquery.ui.datepicker.css
index 0f4e71562..c1f269999 100644
--- a/themes/base/jquery.ui.datepicker.css
+++ b/themes/base/jquery.ui.datepicker.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Datepicker#theming
diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css
index 22523c82c..2937af9b7 100644
--- a/themes/base/jquery.ui.dialog.css
+++ b/themes/base/jquery.ui.dialog.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Dialog#theming
diff --git a/themes/base/jquery.ui.menu.css b/themes/base/jquery.ui.menu.css
index 85c387387..ea4b24e26 100644
--- a/themes/base/jquery.ui.menu.css
+++ b/themes/base/jquery.ui.menu.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Menu#theming
diff --git a/themes/base/jquery.ui.progressbar.css b/themes/base/jquery.ui.progressbar.css
index 877666589..a8b3d7442 100644
--- a/themes/base/jquery.ui.progressbar.css
+++ b/themes/base/jquery.ui.progressbar.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Progressbar#theming
diff --git a/themes/base/jquery.ui.resizable.css b/themes/base/jquery.ui.resizable.css
index bca140eda..291bdb209 100644
--- a/themes/base/jquery.ui.resizable.css
+++ b/themes/base/jquery.ui.resizable.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Resizable#theming
diff --git a/themes/base/jquery.ui.selectable.css b/themes/base/jquery.ui.selectable.css
index 0fa8942aa..e00779d7e 100644
--- a/themes/base/jquery.ui.selectable.css
+++ b/themes/base/jquery.ui.selectable.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Selectable#theming
diff --git a/themes/base/jquery.ui.slider.css b/themes/base/jquery.ui.slider.css
index 39d15b034..5e7a9734f 100644
--- a/themes/base/jquery.ui.slider.css
+++ b/themes/base/jquery.ui.slider.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Slider#theming
diff --git a/themes/base/jquery.ui.spinner.css b/themes/base/jquery.ui.spinner.css
index 41ffe539c..94b73fa05 100644
--- a/themes/base/jquery.ui.spinner.css
+++ b/themes/base/jquery.ui.spinner.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Spinner#theming
diff --git a/themes/base/jquery.ui.tabs.css b/themes/base/jquery.ui.tabs.css
index a2efae8b0..405b6932a 100644
--- a/themes/base/jquery.ui.tabs.css
+++ b/themes/base/jquery.ui.tabs.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Tabs#theming
diff --git a/themes/base/jquery.ui.theme.css b/themes/base/jquery.ui.theme.css
index 86da8a295..343a2f433 100644
--- a/themes/base/jquery.ui.theme.css
+++ b/themes/base/jquery.ui.theme.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Theming/API
diff --git a/themes/base/jquery.ui.tooltip.css b/themes/base/jquery.ui.tooltip.css
index ed29c137a..e293eeb23 100644
--- a/themes/base/jquery.ui.tooltip.css
+++ b/themes/base/jquery.ui.tooltip.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  */
 .ui-tooltip {
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 7d98886e7..de9e1a3cb 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Accordion
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 6a16c576e..617aa9c70 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Autocomplete
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 1aa44abdd..5c3fb7589 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Button
diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js
index 3e102f181..0e33f11ed 100644
--- a/ui/jquery.ui.core.js
+++ b/ui/jquery.ui.core.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index d54c4fb85..091fe3101 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Datepicker
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 85e4b3e2b..66c7f4dff 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Dialog
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 2f05ad6a4..b693dccae 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Draggables
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index 17a56787a..36179d6d5 100644
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Droppables
diff --git a/ui/jquery.ui.effect-blind.js b/ui/jquery.ui.effect-blind.js
index a5c41325c..c4ff12fdc 100644
--- a/ui/jquery.ui.effect-blind.js
+++ b/ui/jquery.ui.effect-blind.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Blind
diff --git a/ui/jquery.ui.effect-bounce.js b/ui/jquery.ui.effect-bounce.js
index 0a93bda08..8a03f4f88 100644
--- a/ui/jquery.ui.effect-bounce.js
+++ b/ui/jquery.ui.effect-bounce.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Bounce
diff --git a/ui/jquery.ui.effect-clip.js b/ui/jquery.ui.effect-clip.js
index 6539acf24..0cef7e0ca 100644
--- a/ui/jquery.ui.effect-clip.js
+++ b/ui/jquery.ui.effect-clip.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Clip
diff --git a/ui/jquery.ui.effect-drop.js b/ui/jquery.ui.effect-drop.js
index 674ef41ec..ce02dd3fd 100644
--- a/ui/jquery.ui.effect-drop.js
+++ b/ui/jquery.ui.effect-drop.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Drop
diff --git a/ui/jquery.ui.effect-explode.js b/ui/jquery.ui.effect-explode.js
index 1048b0a42..76e92fac3 100644
--- a/ui/jquery.ui.effect-explode.js
+++ b/ui/jquery.ui.effect-explode.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Explode
diff --git a/ui/jquery.ui.effect-fade.js b/ui/jquery.ui.effect-fade.js
index ee031fcd8..5f5fcbfae 100644
--- a/ui/jquery.ui.effect-fade.js
+++ b/ui/jquery.ui.effect-fade.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Fade
diff --git a/ui/jquery.ui.effect-fold.js b/ui/jquery.ui.effect-fold.js
index 7619285c2..1e0e475f5 100644
--- a/ui/jquery.ui.effect-fold.js
+++ b/ui/jquery.ui.effect-fold.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Fold
diff --git a/ui/jquery.ui.effect-highlight.js b/ui/jquery.ui.effect-highlight.js
index f6868d136..2ae5729dc 100644
--- a/ui/jquery.ui.effect-highlight.js
+++ b/ui/jquery.ui.effect-highlight.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Highlight
diff --git a/ui/jquery.ui.effect-pulsate.js b/ui/jquery.ui.effect-pulsate.js
index 543f6310d..d1e74ea8e 100644
--- a/ui/jquery.ui.effect-pulsate.js
+++ b/ui/jquery.ui.effect-pulsate.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Pulsate
diff --git a/ui/jquery.ui.effect-scale.js b/ui/jquery.ui.effect-scale.js
index 5e1dc8540..4283fe842 100644
--- a/ui/jquery.ui.effect-scale.js
+++ b/ui/jquery.ui.effect-scale.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Scale
diff --git a/ui/jquery.ui.effect-shake.js b/ui/jquery.ui.effect-shake.js
index 51d8e1129..fd9605d0a 100644
--- a/ui/jquery.ui.effect-shake.js
+++ b/ui/jquery.ui.effect-shake.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Shake
diff --git a/ui/jquery.ui.effect-slide.js b/ui/jquery.ui.effect-slide.js
index 134b058c7..5f0aa1e45 100644
--- a/ui/jquery.ui.effect-slide.js
+++ b/ui/jquery.ui.effect-slide.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Slide
diff --git a/ui/jquery.ui.effect-transfer.js b/ui/jquery.ui.effect-transfer.js
index 7d6c10933..ddf8139b6 100644
--- a/ui/jquery.ui.effect-transfer.js
+++ b/ui/jquery.ui.effect-transfer.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/Transfer
diff --git a/ui/jquery.ui.effect.js b/ui/jquery.ui.effect.js
index 7cabe5849..ec8260709 100644
--- a/ui/jquery.ui.effect.js
+++ b/ui/jquery.ui.effect.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Effects/
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 055b13319..78b602cce 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Menu
diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index dc10d9401..a08566b90 100644
--- a/ui/jquery.ui.mouse.js
+++ b/ui/jquery.ui.mouse.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Mouse
diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js
index 2802b2ce0..eef8a95c9 100644
--- a/ui/jquery.ui.position.js
+++ b/ui/jquery.ui.position.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Position
diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js
index 74a2d6923..7f1ebf77d 100644
--- a/ui/jquery.ui.progressbar.js
+++ b/ui/jquery.ui.progressbar.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Progressbar
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index be174dd7e..584f3a234 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Resizables
diff --git a/ui/jquery.ui.selectable.js b/ui/jquery.ui.selectable.js
index 1da7fffa3..95bc92faa 100644
--- a/ui/jquery.ui.selectable.js
+++ b/ui/jquery.ui.selectable.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Selectables
diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index adceb356c..0434d8075 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Slider
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index db24fed38..8d7b6ccb8 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Sortables
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index ead3b17be..11377f6a6 100644
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Spinner
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 588b8cdb2..b31ce364a 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Tabs
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 8bfe78c05..9f0a8a810 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * Depends:
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index b5dfaa344..924d10bc2 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Widget
-- 
cgit v1.2.3


From 30b579f598a3abdc9b0b7ad18bc76c8b5438d5ca Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 9 Aug 2012 16:32:16 -0400
Subject: Datepicker: Unescape double escaped ids when handling events. Fixes
 #8480 - Datepicker 1.8.22 escaped id does not work.

---
 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 091fe3101..cd4ffe3ee 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1414,7 +1414,7 @@ $.extend(Datepicker.prototype, {
 	 */
 	_attachHandlers: function(inst) {
 		var stepMonths = this._get(inst, 'stepMonths');
-		var id = '#' + inst.id;
+		var id = '#' + inst.id.replace( /\\\\/g, "\\" );
 		inst.dpDiv.find('[data-handler]').map(function () {
 			var handler = {
 				prev: function () {
-- 
cgit v1.2.3