Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Restore jQuery.access parameter mistakenly removed in 80d45a6

  • Loading branch information...
commit 0ee94159023bebe1992c5281d0f4778b4f75ff0d 1 parent 81b094b
@gibson042 gibson042 authored
Showing with 56 additions and 40 deletions.
  1. +17 −14 src/core.js
  2. +1 −1  src/data.js
  3. +38 −25 test/unit/data.js
View
31 src/core.js
@@ -782,41 +782,44 @@ 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 ) {
+ access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
var i = 0,
length = elems.length,
- bulk = key == null,
- exec = value !== undefined && jQuery.isFunction( value );
+ bulk = key == null;
// Sets many values
if ( key && typeof key === "object" ) {
chainable = true;
for ( i in key ) {
- jQuery.access( elems, fn, i, key[i], true, emptyGet );
+ jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
}
// Sets one value
} else if ( value !== undefined ) {
chainable = true;
- if ( bulk ) {
- // Bulk operations only iterate when executing function values
- if ( exec ) {
- exec = fn;
- fn = function( elem, key, value ) {
- return exec.call( jQuery( elem ), value );
- };
+ if ( !jQuery.isFunction( value ) ) {
+ raw = true;
+ }
- // Otherwise they run against the entire set
- } else {
+ if ( bulk ) {
+ // Bulk operations run against the entire set
+ if ( raw ) {
fn.call( elems, value );
fn = null;
+
+ // ...except when executing function values
+ } else {
+ bulk = fn;
+ fn = function( elem, key, value ) {
+ return bulk.call( jQuery( elem ), value );
+ };
}
}
if ( fn ) {
for ( ; i < length; i++ ) {
- fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value );
+ fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
}
}
}
View
2  src/data.js
@@ -277,7 +277,7 @@ jQuery.fn.extend({
this.each(function() {
jQuery.data( this, key, value );
});
- }, null, value, arguments.length > 1, null, false );
+ }, null, value, arguments.length > 1, null, true );
},
removeData: function( key ) {
View
63 test/unit/data.js
@@ -174,40 +174,53 @@ test(".data()", function() {
deepEqual( dataObj, { "foo": "baz" }, "Retrieve data object from a wrapped JS object (#7524)" );
});
-test(".data(String) and .data(String, Object)", function() {
- expect( 12 );
+var testDataTypes = function( $obj ) {
+ jQuery.each({
+ "null": null,
+ "true": true,
+ "false": false,
+ "zero": 0,
+ "one": 1,
+ "empty string": "",
+ "empty array": [],
+ "array": [1],
+ "empty object": {},
+ "object": { foo: "bar" },
+ "date": new Date(),
+ "regex": /test/,
+ "function": function() {}
+ }, function( type, value ) {
+ strictEqual( $obj.data( "test", value ).data("test"), value, "Data set to " + type );
+ });
+};
+
+test("jQuery(Element).data(String, Object).data(String)", function() {
+ expect( 18 );
var parent = jQuery("<div><div></div></div>"),
div = parent.children();
- ok( div.data("test") === undefined, "Check for no data exists" );
-
- div.data("test", "success");
- equal( div.data("test"), "success", "Check for added data" );
-
- div.data("test", "overwritten");
- equal( div.data("test"), "overwritten", "Check for overwritten data" );
-
- equal( div.data("test", undefined).data("test"), "overwritten", "Check that .data('key',undefined) does nothing but is chainable (#5571)");
+ strictEqual( div.data("test"), undefined, "No data exists initially" );
+ strictEqual( div.data("test", "success").data("test"), "success", "Data added" );
+ strictEqual( div.data("test", "overwritten").data("test"), "overwritten", "Data overwritten" );
+ strictEqual( div.data("test", undefined).data("test"), "overwritten", ".data(key,undefined) does nothing but is chainable (#5571)");
+ strictEqual( div.data("notexist"), undefined, "No data exists for unset key" );
+ testDataTypes( div );
- div.data("test", null);
- ok( div.data("test") === null, "Check for null data");
+ parent.remove();
+});
- ok( div.data("notexist") === undefined, "Check for no data exists" );
+test("jQuery(plain Object).data(String, Object).data(String)", function() {
+ expect( 16 );
// #3748
- var $elem = jQuery({exists:true});
- equal( $elem.data("nothing"), undefined, "Non-existent data returns undefined");
- equal( $elem.data("null", null).data("null"), null, "null's are preserved");
- equal( $elem.data("emptyString", "").data("emptyString"), "", "Empty strings are preserved");
- equal( $elem.data("false", false).data("false"), false, "false's are preserved");
- equal( $elem.data("exists"), undefined, "Existing data is not returned" );
+ var $obj = jQuery({ exists: true });
+ strictEqual( $obj.data("nothing"), undefined, "Non-existent data returns undefined");
+ strictEqual( $obj.data("exists"), undefined, "Object properties are not returned as data" );
+ testDataTypes( $obj );
// Clean up
- $elem.removeData();
- deepEqual( $elem[0], {exists:true}, "removeData does not clear the object" );
-
- // manually clean up detached elements
- parent.remove();
+ $obj.removeData();
+ deepEqual( $obj[0], { exists: true }, "removeData does not clear the object" );
});
test("data-* attributes", function() {
Please sign in to comment.
Something went wrong with that request. Please try again.