From: Scott González Date: Fri, 12 Jun 2009 13:26:45 +0000 (+0000) Subject: Effects core: Fixed indentation for color animation overrides. X-Git-Tag: 1.8a1~95 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f22f205cfc3c71d54f47da702c07a978f07a27c9;p=jquery-ui.git Effects core: Fixed indentation for color animation overrides. --- diff --git a/ui/effects.core.js b/ui/effects.core.js index e1b7b2515..cc74a1233 100644 --- a/ui/effects.core.js +++ b/ui/effects.core.js @@ -237,26 +237,23 @@ $.fn.extend({ } }); -/* - * jQuery Color Animations - * Copyright 2007 John Resig - * Released under the MIT and GPL licenses. - */ -// We override the animation for all of these color styles -$.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'], function(i,attr){ - $.fx.step[attr] = function(fx) { - if ( fx.state == 0 ) { - fx.start = getColor( fx.elem, attr ); - fx.end = getRGB( fx.end ); - } - - fx.elem.style[attr] = "rgb(" + [ - Math.max(Math.min( parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0],10), 255), 0), - Math.max(Math.min( parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1],10), 255), 0), - Math.max(Math.min( parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2],10), 255), 0) - ].join(",") + ")"; - }; +// override the animation for color styles +$.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', + 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'], + function(i,attr){ + $.fx.step[attr] = function(fx) { + if (fx.state == 0) { + fx.start = getColor( fx.elem, attr ); + fx.end = getRGB( fx.end ); + } + + fx.elem.style[attr] = "rgb(" + [ + Math.max(Math.min( parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0],10), 255), 0), + Math.max(Math.min( parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1],10), 255), 0), + Math.max(Math.min( parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2],10), 255), 0) + ].join(",") + ")"; + }; }); // Color Conversion functions from highlightFade