From: Richard Gibson <richard.gibson@gmail.com>
Date: Mon, 5 Nov 2012 22:21:24 +0000 (-0500)
Subject: Fix #12840: remove undocumented parameter "pass" from .attr. Close gh-1017.
X-Git-Tag: 1.9.0b1~119
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=80d45a69ea5e81897ebcb6868a902f3b21d5b101;p=jquery.git

Fix #12840: remove undocumented parameter "pass" from .attr. Close gh-1017.
---

diff --git a/src/attributes.js b/src/attributes.js
index dbaf3d5eb..8ae23f72a 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -280,7 +280,7 @@ jQuery.extend({
 		}
 	},
 
-	attr: function( elem, name, value, pass ) {
+	attr: function( elem, name, value ) {
 		var ret, hooks, notxml,
 			nType = elem.nodeType;
 
@@ -289,10 +289,6 @@ jQuery.extend({
 			return;
 		}
 
-		if ( pass && jQuery.isFunction( jQuery.fn[ name ] ) ) {
-			return jQuery( elem )[ name ]( value );
-		}
-
 		// Fallback to prop when attributes are not supported
 		if ( typeof elem.getAttribute === "undefined" ) {
 			return jQuery.prop( elem, name, value );
@@ -311,9 +307,8 @@ jQuery.extend({
 
 			if ( value === null ) {
 				jQuery.removeAttr( elem, name );
-				return;
 
-			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
+			} else if ( hooks && notxml && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
 				return ret;
 
 			} else {
@@ -321,7 +316,7 @@ jQuery.extend({
 				return value;
 			}
 
-		} else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
+		} else if ( hooks && notxml && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
 			return ret;
 
 		} else {
diff --git a/src/core.js b/src/core.js
index 1b3f106ae..f34d72c25 100644
--- a/src/core.js
+++ b/src/core.js
@@ -84,14 +84,14 @@ var
 jQuery.fn = jQuery.prototype = {
 	constructor: jQuery,
 	init: function( selector, context, rootjQuery ) {
-		var match, elem, doc;
+		var match, elem;
 
-		// Handle $(""), $(null), $(undefined), $(false)
+		// HANDLE: $(""), $(null), $(undefined), $(false)
 		if ( !selector ) {
 			return this;
 		}
 
-		// Handle $(DOMElement)
+		// HANDLE: $(DOMElement)
 		if ( selector.nodeType ) {
 			this.context = this[0] = selector;
 			this.length = 1;
@@ -114,15 +114,29 @@ jQuery.fn = jQuery.prototype = {
 				// HANDLE: $(html) -> $(array)
 				if ( match[1] ) {
 					context = context instanceof jQuery ? context[0] : context;
-					doc = ( context && context.nodeType ? context.ownerDocument || context : document );
 
 					// scripts is true for back-compat
-					selector = jQuery.parseHTML( match[1], doc, true );
+					jQuery.merge( this, jQuery.parseHTML(
+						match[1],
+						context && context.nodeType ? context.ownerDocument || context : document,
+						true
+					) );
+
+					// HANDLE: $(html, props)
 					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						this.attr.call( selector, context, true );
+						for ( match in context ) {
+							// Properties of context are called as methods if possible
+							if ( jQuery.isFunction( this[ match ] ) ) {
+								this[ match ]( context[ match ] );
+
+							// ...and otherwise set as attributes
+							} else {
+								this.attr( match, context[ match ] );
+							}
+						}
 					}
 
-					return jQuery.merge( this, selector );
+					return this;
 
 				// HANDLE: $(#id)
 				} else {
@@ -768,23 +782,22 @@ jQuery.extend({
 
 	// Multifunctional method to get and set values of a collection
 	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
-		var exec,
+	access: function( elems, fn, key, value, chainable, emptyGet ) {
+		var i = 0,
+			length = elems.length,
 			bulk = key == null,
-			i = 0,
-			length = elems.length;
+			exec = value !== undefined && jQuery.isFunction( value );
 
 		// Sets many values
 		if ( key && typeof key === "object" ) {
+			chainable = true;
 			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
+				jQuery.access( elems, fn, i, key[i], true, emptyGet );
 			}
-			chainable = 1;
 
 		// Sets one value
 		} else if ( value !== undefined ) {
-			// Optionally, function values get executed if exec is true
-			exec = pass === undefined && jQuery.isFunction( value );
+			chainable = true;
 
 			if ( bulk ) {
 				// Bulk operations only iterate when executing function values
@@ -802,12 +815,10 @@ jQuery.extend({
 			}
 
 			if ( fn ) {
-				for (; i < length; i++ ) {
-					fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+				for ( ; i < length; i++ ) {
+					fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value );
 				}
 			}
-
-			chainable = 1;
 		}
 
 		return chainable ?
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index e2648a0e6..3ad08a75a 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -435,84 +435,6 @@ test( "attr(String, Object)", function() {
 	equal( jQuery("#name").attr( "nonexisting", undefined ).attr("nonexisting"), undefined, ".attr('attribute', undefined) does not create attribute (#5571)" );
 });
 
-test( "attr(jquery_method)", function() {
-
-	var $elem = jQuery("<div />"),
-		elem = $elem[ 0 ],
-		expected = 2,
-		attrObj = {};
-
-	if ( jQuery.fn.width ) {
-		expected += 2;
-		attrObj["width"] = 10;
-	}
-
-	if ( jQuery.fn.offset ) {
-		expected += 2;
-		attrObj["offset"] = {
-			"top": 1,
-			"left": 0
-		};
-	}
-
-	if ( jQuery.css ) {
-		expected += 3;
-		attrObj["css"] = {
-			"paddingLeft": 1,
-			"paddingRight": 1
-		};
-	}
-
-	expect( expected );
-
-	// one at a time
-	$elem.attr({
-		"html": "foo"
-	}, true );
-	equal( elem.innerHTML, "foo", "attr(html)" );
-
-	$elem.attr({
-		"text": "bar"
-	}, true );
-	equal( elem.innerHTML, "bar", "attr(text)" );
-
-	// Multiple attributes
-	$elem.attr( attrObj, true );
-
-	if ( jQuery.fn.width ) {
-		equal( elem.style.width, "10px", "attr({width:})" );
-
-		$elem.attr( {
-			"height": 10
-		}, true );
-		equal( elem.style.height, "10px", "attr(height)" );
-	}
-
-	if ( jQuery.fn.offset ) {
-		equal( elem.style.top, "1px", "attr({offset:})" );
-
-		$elem.attr({
-			offset: {
-				top: 1,
-				left: 1
-			}
-		}, true );
-		equal( elem.style.left, "1px", "attr(offset)" );
-	}
-
-	if ( jQuery.css ) {
-		equal( elem.style.paddingLeft, "1px", "attr({css:})" );
-		equal( elem.style.paddingRight, "1px", "attr({css:})" );
-
-		$elem.attr({
-			"css": {
-				"color": "red"
-			}
-		}, true );
-		ok( /^(#ff0000|red)$/i.test( elem.style.color ), "attr(css)" );
-	}
-});
-
 test( "attr(String, Object) - Loaded via XML document", function() {
 	expect( 2 );
 	var xml = createDashboardXML();