From 842958e7aecd0d75a7ee9e2aaec83457701aa2f3 Mon Sep 17 00:00:00 2001 From: Michał Gołębiowski Date: Wed, 17 Jun 2015 12:55:59 +0200 Subject: Core: Switch from modules to just window.setTimeout etc. Using modules for window.setTimeout etc. made those functions cached and disabled Sinon mocking, making effects tests fail. Just writing window.setTimeout directly is smaller anyway. --- src/effects.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/effects.js') diff --git a/src/effects.js b/src/effects.js index 63874fe78..53b73fd84 100644 --- a/src/effects.js +++ b/src/effects.js @@ -2,9 +2,6 @@ define([ "./core", "./var/document", "./var/rcssNum", - "./var/setInterval", - "./var/clearInterval", - "./var/setTimeout", "./css/var/cssExpand", "./css/var/isHidden", "./css/var/swap", @@ -19,8 +16,7 @@ define([ "./manipulation", "./css", "./effects/Tween" -], function( jQuery, document, rcssNum, setInterval, clearInterval, setTimeout, - cssExpand, isHidden, swap, adjustCSS, dataPriv, showHide ) { +], function( jQuery, document, rcssNum, cssExpand, isHidden, swap, adjustCSS, dataPriv, showHide ) { var fxNow, timerId, @@ -44,7 +40,7 @@ function raf() { // Animations created synchronously will run synchronously function createFxNow() { - setTimeout(function() { + window.setTimeout(function() { fxNow = undefined; }); return ( fxNow = jQuery.now() ); @@ -638,7 +634,7 @@ jQuery.fx.start = function() { if ( !timerId ) { timerId = window.requestAnimationFrame ? window.requestAnimationFrame( raf ) : - setInterval( jQuery.fx.tick, jQuery.fx.interval ); + window.setInterval( jQuery.fx.tick, jQuery.fx.interval ); } }; @@ -646,7 +642,7 @@ jQuery.fx.stop = function() { if ( window.cancelAnimationFrame ) { window.cancelAnimationFrame( timerId ); } else { - clearInterval( timerId ); + window.clearInterval( timerId ); } timerId = null; -- cgit v1.2.3