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.
This commit is contained in:
Michał Gołębiowski
2015-06-17 12:55:59 +02:00
parent 219c749493
commit 842958e7ae
9 changed files with 14 additions and 37 deletions

View File

@@ -2,8 +2,6 @@ define([
"./core",
"./var/document",
"./var/rnotwhite",
"./var/setTimeout",
"./var/clearTimeout",
"./ajax/var/location",
"./ajax/var/nonce",
"./ajax/var/rquery",
@@ -11,8 +9,7 @@ define([
"./ajax/parseJSON",
"./ajax/parseXML",
"./deferred"
], function( jQuery, document, rnotwhite, setTimeout, clearTimeout,
location, nonce, rquery ) {
], function( jQuery, document, rnotwhite, location, nonce, rquery ) {
var
rhash = /#.*$/,
@@ -645,7 +642,7 @@ jQuery.extend({
// Timeout
if ( s.async && s.timeout > 0 ) {
timeoutTimer = setTimeout(function() {
timeoutTimer = window.setTimeout(function() {
jqXHR.abort("timeout");
}, s.timeout );
}
@@ -679,7 +676,7 @@ jQuery.extend({
// Clear timeout if it exists
if ( timeoutTimer ) {
clearTimeout( timeoutTimer );
window.clearTimeout( timeoutTimer );
}
// Dereference transport for early garbage collection

View File

@@ -1,9 +1,8 @@
define([
"../core",
"../var/document",
"../var/setTimeout",
"../deferred"
], function( jQuery, document, setTimeout ) {
], function( jQuery, document ) {
// The deferred used on DOM ready
var readyList;
@@ -74,7 +73,7 @@ jQuery.ready.promise = function( obj ) {
// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
if ( document.readyState === "complete" ) {
// Handle it asynchronously to allow scripts the opportunity to delay ready
setTimeout( jQuery.ready );
window.setTimeout( jQuery.ready );
} else {

View File

@@ -1,9 +1,8 @@
define([
"./core",
"./var/slice",
"./var/setTimeout",
"./callbacks"
], function( jQuery, slice, setTimeout ) {
], function( jQuery, slice ) {
function Identity( v ) {
return v;
@@ -174,7 +173,7 @@ jQuery.extend({
if ( depth ) {
process();
} else {
setTimeout( process );
window.setTimeout( process );
}
};
}

12
src/effects.js vendored
View File

@@ -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;

View File

@@ -1,10 +1,8 @@
define([
"../core",
"../var/setTimeout",
"../var/clearTimeout",
"../queue",
"../effects" // Delay is optional because of this dependency
], function( jQuery, setTimeout, clearTimeout ) {
], function( jQuery ) {
// Based off of the plugin by Clint Helfers, with permission.
// http://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
@@ -13,9 +11,9 @@ jQuery.fn.delay = function( time, type ) {
type = type || "fx";
return this.queue( type, function( next, hooks ) {
var timeout = setTimeout( next, time );
var timeout = window.setTimeout( next, time );
hooks.stop = function() {
clearTimeout( timeout );
window.clearTimeout( timeout );
};
});
};

View File

@@ -1,3 +0,0 @@
define(function() {
return window.clearInterval;
});

View File

@@ -1,3 +0,0 @@
define(function() {
return window.clearTimeout;
});

View File

@@ -1,3 +0,0 @@
define(function() {
return window.setInterval;
});

View File

@@ -1,3 +0,0 @@
define(function() {
return window.setTimeout;
});