deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch '8101_lrbabe_requestAnimationFrame' of https://github.com/timmywil/jquery into timmywil-8101_lrbabe_requestAnimationFrame

Browse source 
Conflicts:
	src/effects.js
This commit is contained in:
jeresig 2011-04-10 17:27:34 -04:00
parent 92dfb53314 791402b453
commit 56ffad2dad
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/effects.js vendored
View file

@ -12,7 +12,10 @@ var elemdisplay = {},
// opacity animations // opacity animations
[ "opacity" ] [ "opacity" ]
], ],
fxNow; fxNow,
requestAnimationFrame = window.webkitRequestAnimationFrame ||
window.mozRequestAnimationFrame ||
window.oRequestAnimationFrame;
function clearFxNow() { function clearFxNow() {
fxNow = undefined; fxNow = undefined;
@ -357,7 +360,8 @@ jQuery.fx.prototype = {
// Start an animation from one number to another // Start an animation from one number to another
custom: function( from, to, unit ) { custom: function( from, to, unit ) {
var self = this, var self = this,
fx = jQuery.fx; fx = jQuery.fx,
raf;
this.startTime = fxNow || createFxNow(); this.startTime = fxNow || createFxNow();
this.start = from; this.start = from;
@ -373,8 +377,21 @@ jQuery.fx.prototype = {
t.elem = this.elem; t.elem = this.elem;
if ( t() && jQuery.timers.push(t) && !timerId ) { if ( t() && jQuery.timers.push(t) && !timerId ) {
// Use requestAnimationFrame instead of setInterval if available
if ( requestAnimationFrame ) {
timerId = 1;
raf = function() {
// When timerId gets set to null at any point, this stops
if ( timerId ) {
requestAnimationFrame( raf );
fx.tick();
}
};
requestAnimationFrame( raf );
} else {
timerId = setInterval( fx.tick, fx.interval ); timerId = setInterval( fx.tick, fx.interval );
} }
}
}, },
// Simple 'show' function // Simple 'show' function