aboutsummaryrefslogtreecommitdiffstats
path: root/src/queue.js
diff options
context:
space:
mode:
authorMike Sherov <mike.sherov@gmail.com>2012-06-28 21:39:58 -0400
committerMike Sherov <mike.sherov@gmail.com>2012-06-28 21:39:58 -0400
commita69fbbaa8bbb2f17d798bb05cca24b01fddcd2a2 (patch)
tree5a03276141ae75e541e8bd5101b824b10613138a /src/queue.js
parent304eebb260fe37d4105d78be8c5c90d1ccce2e39 (diff)
downloadjquery-a69fbbaa8bbb2f17d798bb05cca24b01fddcd2a2.tar.gz
jquery-a69fbbaa8bbb2f17d798bb05cca24b01fddcd2a2.zip
stop using reserved words as argument names
Diffstat (limited to 'src/queue.js')
-rw-r--r--src/queue.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/queue.js b/src/queue.js
index e47f721b8..d49b3dd68 100644
--- a/src/queue.js
+++ b/src/queue.js
@@ -112,7 +112,7 @@ jQuery.fn.extend({
},
// Get a promise resolved when queues of a certain type
// are emptied (fx is the type by default)
- promise: function( type, object ) {
+ promise: function( type, obj ) {
var tmp,
count = 1,
defer = jQuery.Deferred(),
@@ -125,7 +125,7 @@ jQuery.fn.extend({
};
if ( typeof type !== "string" ) {
- object = type;
+ obj = type;
type = undefined;
}
type = type || "fx";
@@ -137,6 +137,6 @@ jQuery.fn.extend({
}
}
resolve();
- return defer.promise( object );
+ return defer.promise( obj );
}
});