Merge branch 'master' into selectmenu

1 files changed, 13 insertions, 4 deletions

diff --git a/ui/jquery.ui.effect.js b/ui/jquery.ui.effect.js
index edb63c14b..1609942f9 100644
--- a/ui/jquery.ui.effect.js
+++ b/ui/jquery.ui.effect.js
@@ -2,7 +2,7 @@
  * jQuery UI Effects @VERSION
  * http://jqueryui.com
  *
- * Copyright 2012 jQuery Foundation and other contributors
+ * Copyright 2013 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -17,14 +17,14 @@ $.effects = {
 };
 
 /*!
- * jQuery Color Animations v2.1.1
+ * jQuery Color Animations v2.1.2pre@b11ed286205199b8db74220cd237c4f045050e63
  * https://github.com/jquery/jquery-color
  *
  * Copyright 2012 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
- * Date: Sun Oct 28 15:08:06 2012 -0400
+ * Date: Thu Jan 3 14:21:32 2013 -0500
  */
 (function( jQuery, undefined ) {
 
@@ -596,7 +596,7 @@ color.hook = function( hook ) {
 				var parsed, curElem,
 					backgroundColor = "";
 
-				if ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) {
+				if ( value !== "transparent" && ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) {
 					value = color( parsed || value );
 					if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
 						curElem = hook === "backgroundColor" ? elem.parentNode : elem;
@@ -754,6 +754,15 @@ function styleDifference( oldStyle, newStyle ) {
 	return diff;
 }
 
+// support: jQuery <1.8
+if ( !$.fn.addBack ) {
+	$.fn.addBack = function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter( selector )
+		);
+	};
+}
+
 $.effects.animateClass = function( value, duration, easing, callback ) {
 	var o = $.speed( duration, easing, callback );