library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Effects: Update jquery-color.

Browse Source
This commit is contained in:
Scott González 2012-06-28 05:45:25 -07:00
parent 7ce30694fd
commit 730446edca
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/.jshintrc
View File

@ -1,5 +1,4 @@
{ {
"boss": true,
"browser": true, "browser": true,
"curly": true, "curly": true,
"eqnull": true, "eqnull": true,

26
ui/jquery.ui.effect.js vendored
View File

@ -21,7 +21,7 @@ $.effects = {
* jQuery Color Animations * jQuery Color Animations
* http://jquery.org/ * http://jquery.org/
* *
* Copyright 2011 John Resig * Copyright 2012 John Resig
* Dual licensed under the MIT or GPL Version 2 licenses. * Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license * http://jquery.org/license
*/ */
@ -149,7 +149,6 @@ var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightCo
floor: true floor: true
} }
}, },
rgbaspace = spaces.rgba.props,
support = color.support = {}, support = color.support = {},
// colors = jQuery.Color.names // colors = jQuery.Color.names
@ -158,11 +157,11 @@ var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightCo
// local aliases of functions called often // local aliases of functions called often
each = jQuery.each; each = jQuery.each;
spaces.hsla.props.alpha = rgbaspace.alpha; spaces.hsla.props.alpha = spaces.rgba.props.alpha;
function clamp( value, prop, alwaysAllowEmpty ) { function clamp( value, prop, alwaysAllowEmpty ) {
var type = propTypes[ prop.type ] || {}, var type = propTypes[ prop.type ] || {},
allowEmpty = prop.empty || alwaysAllowEmpty; allowEmpty = alwaysAllowEmpty || prop.empty;
if ( allowEmpty && value == null ) { if ( allowEmpty && value == null ) {
return null; return null;
@ -179,7 +178,7 @@ function clamp( value, prop, alwaysAllowEmpty ) {
return prop.def; return prop.def;
} }
if ( type.mod ) { if ( type.mod ) {
value = value % type.mod; value %= type.mod;
// -10 -> 350 // -10 -> 350
return value < 0 ? type.mod + value : value; return value < 0 ? type.mod + value : value;
} }
@ -226,21 +225,18 @@ function stringParse( string ) {
return inst; return inst;
} }
// named colors / default - filter back through parse function // named colors
if ( string = colors[ string ] ) { return colors[ string ];
return string;
}
} }
color.fn = color.prototype = { color.fn = jQuery.extend( color.prototype, {
constructor: color,
parse: function( red, green, blue, alpha ) { parse: function( red, green, blue, alpha ) {
if ( red === undefined ) { if ( red === undefined ) {
this._rgba = [ null, null, null, null ]; this._rgba = [ null, null, null, null ];
return this; return this;
} }
if ( red instanceof jQuery || red.nodeType ) { if ( red.jquery || red.nodeType ) {
red = red instanceof jQuery ? red.css( green ) : jQuery( red ).css( green ); red = jQuery( red ).css( green );
green = undefined; green = undefined;
} }
@ -260,7 +256,7 @@ color.fn = color.prototype = {
} }
if ( type === "array" ) { if ( type === "array" ) {
each( rgbaspace, function( key, prop ) { each( spaces.rgba.props, function( key, prop ) {
rgba[ prop.idx ] = clamp( red[ prop.idx ], prop ); rgba[ prop.idx ] = clamp( red[ prop.idx ], prop );
}); });
return this; return this;
@ -428,7 +424,7 @@ color.fn = color.prototype = {
toString: function() { toString: function() {
return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString(); return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
} }
}; });
color.fn.parse.prototype = color.fn; color.fn.parse.prototype = color.fn;
// hsla conversions adapted from: // hsla conversions adapted from: