Fix #12026. Let props in $(html, props) be any jQuery.fn method.

Closes gh-839.

diff --git a/src/attributes.js b/src/attributes.js
index 858002c0f986d1047865e52725dbe3878f01fa93..d7ad3156aae4a51b59ae6bf4d0a236412ad562f3 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -281,17 +281,6 @@ jQuery.extend({
                }
        },
 
-       attrFn: {
-               val: true,
-               css: true,
-               html: true,
-               text: true,
-               data: true,
-               width: true,
-               height: true,
-               offset: true
-       },
-
        attr: function( elem, name, value, pass ) {
                var ret, hooks, notxml,
                        nType = elem.nodeType;
@@ -301,7 +290,7 @@ jQuery.extend({
                        return;
                }
 
-               if ( pass && name in jQuery.attrFn ) {
+               if ( pass && jQuery.isFunction( jQuery.fn[ name ] ) ) {
                        return jQuery( elem )[ name ]( value );
                }
 

diff --git a/test/unit/core.js b/test/unit/core.js
index 58305b688694e29f734f8912b8ef89943a3ae870..44920edcf9c13b60d8027798bc952d1b897b4fac 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -35,20 +35,24 @@ test("jQuery()", function() {
                        "id": "test3"
                };
 
+       // The $(html, props) signature can stealth-call any $.fn method, check for a
+       // few here but beware of modular builds where these methods may be excluded.
        if ( jQuery.fn.width ) {
                expected++;
                attrObj["width"] = 10;
        }
-
        if ( jQuery.fn.offset ) {
                expected++;
                attrObj["offset"] = { "top": 1, "left": 1 };
        }
-
-       if ( jQuery.css ) {
+       if ( jQuery.fn.css ) {
                expected += 2;
                attrObj["css"] = { "paddingLeft": 1, "paddingRight": 1 };
        }
+       if ( jQuery.fn.attr ) {
+               expected++;
+               attrObj.attr = { "desired": "very" };
+       }
 
        expect( expected );
 
@@ -107,11 +111,15 @@ test("jQuery()", function() {
                equal( elem[0].style.top, "1px", "jQuery() quick setter offset");
        }
 
-       if ( jQuery.css ) {
+       if ( jQuery.fn.css ) {
                equal( elem[0].style.paddingLeft, "1px", "jQuery quick setter css");
                equal( elem[0].style.paddingRight, "1px", "jQuery quick setter css");
        }
 
+       if ( jQuery.fn.attr ) {
+               equal( elem[0].getAttribute("desired"), "very", "jQuery quick setter attr");
+       }
+
        equal( elem[0].childNodes.length, 1, "jQuery quick setter text");
        equal( elem[0].firstChild.nodeValue, "test", "jQuery quick setter text");
        equal( elem[0].className, "test2", "jQuery() quick setter class");