aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ajax.js9
-rw-r--r--src/core/ready.js5
-rw-r--r--src/deferred.js5
-rw-r--r--src/effects.js12
-rw-r--r--src/queue/delay.js8
-rw-r--r--src/var/clearInterval.js3
-rw-r--r--src/var/clearTimeout.js3
-rw-r--r--src/var/setInterval.js3
-rw-r--r--src/var/setTimeout.js3
9 files changed, 14 insertions, 37 deletions
diff --git a/src/ajax.js b/src/ajax.js
index 21668165e..9c1d6ca85 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -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
diff --git a/src/core/ready.js b/src/core/ready.js
index b78b474cd..085d19a93 100644
--- a/src/core/ready.js
+++ b/src/core/ready.js
@@ -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 {
diff --git a/src/deferred.js b/src/deferred.js
index 043bf0c04..188303c97 100644
--- a/src/deferred.js
+++ b/src/deferred.js
@@ -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 );
}
};
}
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;
diff --git a/src/queue/delay.js b/src/queue/delay.js
index d2aa7e409..93abd0bf2 100644
--- a/src/queue/delay.js
+++ b/src/queue/delay.js
@@ -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 );
};
});
};
diff --git a/src/var/clearInterval.js b/src/var/clearInterval.js
deleted file mode 100644
index b8fcf3155..000000000
--- a/src/var/clearInterval.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
- return window.clearInterval;
-});
diff --git a/src/var/clearTimeout.js b/src/var/clearTimeout.js
deleted file mode 100644
index ab77b074a..000000000
--- a/src/var/clearTimeout.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
- return window.clearTimeout;
-});
diff --git a/src/var/setInterval.js b/src/var/setInterval.js
deleted file mode 100644
index 7d9906b1d..000000000
--- a/src/var/setInterval.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
- return window.setInterval;
-});
diff --git a/src/var/setTimeout.js b/src/var/setTimeout.js
deleted file mode 100644
index cda6b55ad..000000000
--- a/src/var/setTimeout.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
- return window.setTimeout;
-});