Effects Core: Upgrading jQuery Color to 2.1.1

diff --git a/ui/jquery.ui.effect.js b/ui/jquery.ui.effect.js
index 37ca48795dee92ca9b0f9e0ec7c836b7dc108b03..0c02c8836258769611d04807015765a1a8f9f6cb 100644 (file)
--- a/ui/jquery.ui.effect.js
+++ b/ui/jquery.ui.effect.js
@@ -19,24 +19,24 @@ $.effects = {
 };
 
 /*!
- * jQuery Color Animations v2.0.0
- * http://jquery.com/
+ * jQuery Color Animations v2.1.1
+ * https://github.com/jquery/jquery-color
  *
  * Copyright 2012 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
- * Date: Mon Aug 13 13:41:02 2012 -0500
+ * Date: Sun Oct 28 15:08:06 2012 -0400
  */
 (function( jQuery, undefined ) {
 
-       var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor".split(" "),
+       var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
 
        // plusequals test for += 100 -= 100
        rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
        // a set of RE's that can match strings and generate color tuples.
        stringParsers = [{
-                       re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
+                       re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
                        parse: function( execResult ) {
                                return [
                                        execResult[ 1 ],
@@ -46,7 +46,7 @@ $.effects = {
                                ];
                        }
                }, {
-                       re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
+                       re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
                        parse: function( execResult ) {
                                return [
                                        execResult[ 1 ] * 2.55,
@@ -76,7 +76,7 @@ $.effects = {
                                ];
                        }
                }, {
-                       re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
+                       re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
                        space: "hsla",
                        parse: function( execResult ) {
                                return [
@@ -293,7 +293,7 @@ color.fn = jQuery.extend( color.prototype, {
                                        });
 
                                        // everything defined but alpha?
-                                       if ( inst[ cache ] && $.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
+                                       if ( inst[ cache ] && jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
                                                // use the default of 1
                                                inst[ cache ][ 3 ] = 1;
                                                if ( space.from ) {
@@ -481,8 +481,10 @@ spaces.hsla.to = function ( rgba ) {
                h = ( 60 * ( r - g ) / diff ) + 240;
        }
 
-       if ( l === 0 || l === 1 ) {
-               s = l;
+       // chroma (diff) == 0 means greyscale which, by definition, saturation = 0%
+       // otherwise, saturation is based on the ratio of chroma (diff) to lightness (add)
+       if ( diff === 0 ) {
+               s = 0;
        } else if ( l <= 0.5 ) {
                s = diff / add;
        } else {
@@ -586,51 +588,58 @@ each( spaces, function( spaceName, space ) {
        });
 });
 
-// add .fx.step functions
-each( stepHooks, function( i, hook ) {
-       jQuery.cssHooks[ hook ] = {
-               set: function( elem, value ) {
-                       var parsed, curElem,
-                               backgroundColor = "";
-
-                       if ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) {
-                               value = color( parsed || value );
-                               if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
-                                       curElem = hook === "backgroundColor" ? elem.parentNode : elem;
-                                       while (
-                                               (backgroundColor === "" || backgroundColor === "transparent") &&
-                                               curElem && curElem.style
-                                       ) {
-                                               try {
-                                                       backgroundColor = jQuery.css( curElem, "backgroundColor" );
-                                                       curElem = curElem.parentNode;
-                                               } catch ( e ) {
+// add cssHook and .fx.step function for each named hook.
+// accept a space separated string of properties
+color.hook = function( hook ) {
+       var hooks = hook.split( " " );
+       each( hooks, function( i, hook ) {
+               jQuery.cssHooks[ hook ] = {
+                       set: function( elem, value ) {
+                               var parsed, curElem,
+                                       backgroundColor = "";
+
+                               if ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) {
+                                       value = color( parsed || value );
+                                       if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
+                                               curElem = hook === "backgroundColor" ? elem.parentNode : elem;
+                                               while (
+                                                       (backgroundColor === "" || backgroundColor === "transparent") &&
+                                                       curElem && curElem.style
+                                               ) {
+                                                       try {
+                                                               backgroundColor = jQuery.css( curElem, "backgroundColor" );
+                                                               curElem = curElem.parentNode;
+                                                       } catch ( e ) {
+                                                       }
                                                }
+
+                                               value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
+                                                       backgroundColor :
+                                                       "_default" );
                                        }
 
-                                       value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
-                                               backgroundColor :
-                                               "_default" );
+                                       value = value.toRgbaString();
+                               }
+                               try {
+                                       elem.style[ hook ] = value;
+                               } catch( e ) {
+                                       // wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
                                }
-
-                               value = value.toRgbaString();
                        }
-                       try {
-                               elem.style[ hook ] = value;
-                       } catch( error ) {
-                               // wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
+               };
+               jQuery.fx.step[ hook ] = function( fx ) {
+                       if ( !fx.colorInit ) {
+                               fx.start = color( fx.elem, hook );
+                               fx.end = color( fx.end );
+                               fx.colorInit = true;
                        }
-               }
-       };
-       jQuery.fx.step[ hook ] = function( fx ) {
-               if ( !fx.colorInit ) {
-                       fx.start = color( fx.elem, hook );
-                       fx.end = color( fx.end );
-                       fx.colorInit = true;
-               }
-               jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) );
-       };
-});
+                       jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) );
+               };
+       });
+
+};
+
+color.hook( stepHooks );
 
 jQuery.cssHooks.borderColor = {
        expand: function( value ) {
@@ -674,7 +683,6 @@ colors = jQuery.Color.names = {
 })( jQuery );
 
 
-
 /******************************************************************************/
 /****************************** CLASS ANIMATIONS ******************************/
 /******************************************************************************/