Moved too-early assignment inside the if stmt where the var is actually used. Close...

(cherry picked from commit 3a434434c420096cef478936ea21b33e9cfae30c)

diff --git a/.mailmap b/.mailmap
index f514768295e2f352f518f254a6b44a13021b78fc..576f2fb4ce58a2b111ffe7f58093e41f22a2baa5 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -91,3 +91,4 @@ Yehuda Katz <wycats@gmail.com> <wycats@12-189-125-93.att-inc.com>
 Yehuda Katz <wycats@gmail.com> <wycats@mobile005.mycingular.net>
 Yehuda Katz <wycats@gmail.com> <wycats@Yehuda-Katz.local>
 Yiming He <yiminghe@gmail.com>
+Terry Jones <terry@jon.es> <terry@fluidinfo.com>

diff --git a/src/callbacks.js b/src/callbacks.js
index 5ca7cea25a04a75311dec7f29000f4548128caf2..f3a643bd89410f6453570233ee8baa26f64700df 100644 (file)
--- a/src/callbacks.js
+++ b/src/callbacks.js
@@ -171,9 +171,9 @@ jQuery.Callbacks = function( options ) {
                        },
                        // Call all callbacks with the given context and arguments
                        fireWith: function( context, args ) {
-                               args = args || [];
-                               args = [ context, args.slice ? args.slice() : args ];
                                if ( list && ( !fired || stack ) ) {
+                                       args = args || [];
+                                       args = [ context, args.slice ? args.slice() : args ];
                                        if ( firing ) {
                                                stack.push( args );
                                        } else {