github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-01-26 03:48:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'qunit_fixture'

Browse Source
This commit is contained in:
timmywil
2011-04-17 14:12:31 -04:00
parent 21c0be8496 68cc3ad730
commit 3aa46725ed
12 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/effects.js vendored
View File

@@ -173,7 +173,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
@@ -274,6 +274,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),
@@ -589,25 +610,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 );