diff options
| author | Mike Sherov <mike.sherov@gmail.com> | 2012-07-06 09:09:40 -0400 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2012-07-06 09:09:40 -0400 |
| commit | 7532bd7df56d8654733ec06617e80447743f2adc (patch) | |
| tree | e4a1d46ede550fd5ae17cb38fb9d3b78c1012912 /src/queue.js | |
| parent | 1793eab32bc8a00b2ad041c9b10ad3bdd2bec702 (diff) | |
| parent | a69fbbaa8bbb2f17d798bb05cca24b01fddcd2a2 (diff) | |
| download | jquery-7532bd7df56d8654733ec06617e80447743f2adc.tar.gz jquery-7532bd7df56d8654733ec06617e80447743f2adc.zip | |
Stop using reserved words as argument names, closes gh-841.
Diffstat (limited to 'src/queue.js')
| -rw-r--r-- | src/queue.js | 6 |
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 ); } }); |