aboutsummaryrefslogtreecommitdiffstats
path: root/src/effects.js
diff options
context:
space:
mode:
authortimmywil <tim.willison@thisismedium.com>2011-04-17 14:08:52 -0400
committertimmywil <tim.willison@thisismedium.com>2011-04-17 14:12:05 -0400
commit68cc3ad730c864afb653971b1353bf5160116c08 (patch)
tree63bf97e87c7a08b8e36b7466a38326d23a674c19 /src/effects.js
parentecf6a3c3831ae6afef6273c06e53ee7710877125 (diff)
downloadjquery-68cc3ad730c864afb653971b1353bf5160116c08.tar.gz
jquery-68cc3ad730c864afb653971b1353bf5160116c08.zip
Update QUnit, fix visibility of #dl and pass JSLint in effects.js
Diffstat (limited to 'src/effects.js')
-rw-r--r--src/effects.js44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/effects.js b/src/effects.js
index 2c7b44cb0..7e693d8d1 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -165,7 +165,7 @@ jQuery.fn.extend({
this.style.display = "inline-block";
} else {
- var display = defaultDisplay(this.nodeName);
+ display = defaultDisplay(this.nodeName);
// inline-level elements accept inline-block;
// block-level elements need to be inline with layout
@@ -266,6 +266,27 @@ jQuery.fn.extend({
});
+// Animations created synchronously will run synchronously
+function createFxNow() {
+ setTimeout( clearFxNow, 0 );
+ return ( fxNow = jQuery.now() );
+}
+
+function clearFxNow() {
+ fxNow = undefined;
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, num ) {
+ var obj = {};
+
+ jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+ obj[ this ] = type;
+ });
+
+ return obj;
+}
+
// Generate shortcuts for custom animations
jQuery.each({
slideDown: genFx("show", 1),
@@ -581,25 +602,4 @@ function defaultDisplay( nodeName ) {
return elemdisplay[ nodeName ];
}
-// Animations created synchronously will run synchronously
-function createFxNow() {
- setTimeout( clearFxNow, 0 );
- return ( fxNow = jQuery.now() );
-}
-
-function clearFxNow() {
- fxNow = undefined;
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, num ) {
- var obj = {};
-
- jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
- obj[ this ] = type;
- });
-
- return obj;
-}
-
})( jQuery );