aboutsummaryrefslogtreecommitdiffstats
path: root/src/effects.js
diff options
context:
space:
mode:
authorTimmy Willison <timmywillisn@gmail.com>2014-07-17 10:25:59 -0700
committerTimmy Willison <timmywillisn@gmail.com>2014-07-17 11:08:37 -0700
commit91e06e9aebecf67a5c4997408bf0a28fffd03f9d (patch)
tree2542fcea18d695dec17642b89ff0beb9dcc3f330 /src/effects.js
parent511eb1540bba2fbd45b6399c60ca361f11e572df (diff)
downloadjquery-91e06e9aebecf67a5c4997408bf0a28fffd03f9d.tar.gz
jquery-91e06e9aebecf67a5c4997408bf0a28fffd03f9d.zip
Build: update grunt-jscs-checker and pass with the new rules
Conflicts: build/tasks/build.js src/ajax/xhr.js src/attributes/classes.js src/attributes/prop.js src/attributes/val.js src/core/init.js src/core/ready.js src/css.js src/css/curCSS.js src/css/defaultDisplay.js src/data.js src/data/var/dataPriv.js src/data/var/dataUser.js src/dimensions.js src/effects.js src/event.js src/manipulation.js src/offset.js src/queue.js src/selector-native.js test/data/testrunner.js
Diffstat (limited to 'src/effects.js')
-rw-r--r--src/effects.js17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/effects.js b/src/effects.js
index 225b31240..189658163 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -45,7 +45,8 @@ var
do {
// If previous iteration zeroed out, double until we get *something*
- // Use a string for doubling factor so we don't accidentally see scale as unchanged below
+ // Use a string for doubling factor so we don't accidentally see scale
+ // as unchanged below
scale = scale || ".5";
// Adjust and apply
@@ -53,8 +54,11 @@ var
jQuery.style( tween.elem, prop, start + unit );
// Update scale, tolerating zero or NaN from tween.cur()
- // And breaking the loop if scale is unchanged or perfect, or if we've just had enough
- } while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
+ // And breaking the loop if scale is unchanged or perfect,
+ // or if we've just had enough
+ } while (
+ scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations
+ );
}
// Update tween properties
@@ -203,7 +207,8 @@ function defaultPrefilter( elem, props, opts ) {
toggle = toggle || value === "toggle";
if ( value === ( hidden ? "hide" : "show" ) ) {
- // If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden
+ // If there is dataShow left over from a stopped hide or show
+ // and we are going to proceed with show, we should pretend to be hidden
if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
hidden = true;
} else {
@@ -533,7 +538,9 @@ jQuery.fn.extend({
}
for ( index = timers.length; index--; ) {
- if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+ if ( timers[ index ].elem === this &&
+ (type == null || timers[ index ].queue === type) ) {
+
timers[ index ].anim.stop( gotoEnd );
dequeue = false;
timers.splice( index, 1 );