Commit cdd5132d authored by Dave Methvin's avatar Dave Methvin

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

Closes gh-839.
parent 1e027610
...@@ -281,17 +281,6 @@ jQuery.extend({ ...@@ -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 ) { attr: function( elem, name, value, pass ) {
var ret, hooks, notxml, var ret, hooks, notxml,
nType = elem.nodeType; nType = elem.nodeType;
...@@ -301,7 +290,7 @@ jQuery.extend({ ...@@ -301,7 +290,7 @@ jQuery.extend({
return; return;
} }
if ( pass && name in jQuery.attrFn ) { if ( pass && jQuery.isFunction( jQuery.fn[ name ] ) ) {
return jQuery( elem )[ name ]( value ); return jQuery( elem )[ name ]( value );
} }
......
...@@ -35,20 +35,24 @@ test("jQuery()", function() { ...@@ -35,20 +35,24 @@ test("jQuery()", function() {
"id": "test3" "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 ) { if ( jQuery.fn.width ) {
expected++; expected++;
attrObj["width"] = 10; attrObj["width"] = 10;
} }
if ( jQuery.fn.offset ) { if ( jQuery.fn.offset ) {
expected++; expected++;
attrObj["offset"] = { "top": 1, "left": 1 }; attrObj["offset"] = { "top": 1, "left": 1 };
} }
if ( jQuery.fn.css ) {
if ( jQuery.css ) {
expected += 2; expected += 2;
attrObj["css"] = { "paddingLeft": 1, "paddingRight": 1 }; attrObj["css"] = { "paddingLeft": 1, "paddingRight": 1 };
} }
if ( jQuery.fn.attr ) {
expected++;
attrObj.attr = { "desired": "very" };
}
expect( expected ); expect( expected );
...@@ -107,11 +111,15 @@ test("jQuery()", function() { ...@@ -107,11 +111,15 @@ test("jQuery()", function() {
equal( elem[0].style.top, "1px", "jQuery() quick setter offset"); 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.paddingLeft, "1px", "jQuery quick setter css");
equal( elem[0].style.paddingRight, "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].childNodes.length, 1, "jQuery quick setter text");
equal( elem[0].firstChild.nodeValue, "test", "jQuery quick setter text"); equal( elem[0].firstChild.nodeValue, "test", "jQuery quick setter text");
equal( elem[0].className, "test2", "jQuery() quick setter class"); equal( elem[0].className, "test2", "jQuery() quick setter class");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment