Added in jQuery.proxy(obj, name), like the method described in Secrets of the JavaScr...

diff --git a/src/core.js b/src/core.js
index 2c5445ab9917443b9bb3c3c7e132c93f1cf84902..3b6cfff45a1c41b6ad878eb06f050e72f528213e 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -618,17 +618,28 @@ jQuery.extend({
        guid: 1,
 
        proxy: function( fn, proxy, thisObject ) {
-               if ( arguments.length === 2 && proxy && !jQuery.isFunction( proxy ) ) {
-                       thisObject = proxy;
-                       proxy = undefined;
+               if ( arguments.length === 2 ) {
+                       if ( typeof proxy === "string" ) {
+                               thisObject = fn;
+                               fn = thisObject[ proxy ];
+                               proxy = undefined;
+
+                       } else if ( proxy && !jQuery.isFunction( proxy ) ) {
+                               thisObject = proxy;
+                               proxy = undefined;
+                       }
                }
 
-               proxy = proxy || function() {
-                       return fn.apply( thisObject || this, arguments );
-               };
+               if ( !proxy && fn ) {
+                       proxy = function() {
+                               return fn.apply( thisObject || this, arguments );
+                       };
+               }
 
                // Set the guid of unique handler to the same of original handler, so it can be removed
-               proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+               if ( fn ) {
+                       proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+               }
 
                // So proxy can be declared as an argument
                return proxy;

diff --git a/test/unit/core.js b/test/unit/core.js
index e3adc604f7445c7df9b80fcb4a89340dfd291161..eb00f23a6b7cca8deeaf0ae922fee4882759e485 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -839,3 +839,22 @@ test("jQuery.isEmptyObject", function(){
        // What about this ?
        // equals(true, jQuery.isEmptyObject(null), "isEmptyObject on null" );
 });
+
+test("jQuery.proxy", function(){
+       expect(4);
+
+       var test = function(){ equals( this, thisObject, "Make sure that scope is set properly." ); };
+       var thisObject = { foo: "bar", method: test };
+
+       // Make sure normal works
+       test.call( thisObject );
+
+       // Basic scoping
+       jQuery.proxy( test, thisObject )();
+
+       // Make sure it doesn't freak out
+       equals( jQuery.proxy( null, thisObject ), undefined, "Make sure no function was returned." );
+
+       // Use the string shortcut
+       jQuery.proxy( thisObject, "method" )();
+});