From d40083c866738727aa7ffd7f13d2955bc9575d5e Mon Sep 17 00:00:00 2001 From: jeresig Date: Fri, 18 Dec 2009 12:41:53 -0500 Subject: [PATCH] Disabled the passthrough .attr(method_name) functionality. You can now use it if you do: .attr({method_name: value}, true) OR as an easy initialization method: jQuery('
', {html: '...', id: 'test'}). --- src/attributes.js | 4 ++-- src/core.js | 14 ++++++++++---- test/unit/attributes.js | 12 ++++++------ test/unit/core.js | 18 +++++++++++++++++- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/attributes.js b/src/attributes.js index 90f3062..e7e5d37 100644 --- a/src/attributes.js +++ b/src/attributes.js @@ -232,13 +232,13 @@ jQuery.extend({ offset: true }, - attr: function( elem, name, value ) { + attr: function( elem, name, value, pass ) { // don't set attributes on text and comment nodes if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { return undefined; } - if ( name in jQuery.attrFn && value !== undefined ) { + if ( pass && name in jQuery.attrFn ) { return jQuery(elem)[name](value); } diff --git a/src/core.js b/src/core.js index bc48e5d..0c0d5a2 100644 --- a/src/core.js +++ b/src/core.js @@ -84,7 +84,13 @@ jQuery.fn = jQuery.prototype = { ret = rsingleTag.exec( selector ); if ( ret ) { - selector = [ doc.createElement( ret[1] ) ]; + if ( jQuery.isPlainObject( context ) ) { + selector = [ document.createElement( ret[1] ) ]; + jQuery.fn.attr.call( selector, context, true ); + + } else { + selector = [ doc.createElement( ret[1] ) ]; + } } else { ret = buildFragment( [ match[1] ], [ doc ] ); @@ -687,13 +693,13 @@ function evalScript( i, elem ) { // Mutifunctional method to get and set values to a collection // The value/s can be optionally by executed if its a function -function access( elems, key, value, exec, fn ) { +function access( elems, key, value, exec, fn, pass ) { var length = elems.length; // Setting many attributes if ( typeof key === "object" ) { for ( var k in key ) { - access( elems, k, key[k], exec, fn ); + access( elems, k, key[k], exec, fn, value ); } return elems; } @@ -704,7 +710,7 @@ function access( elems, key, value, exec, fn ) { exec = exec && jQuery.isFunction(value); for ( var i = 0; i < length; i++ ) { - fn( elems[i], key, exec ? value.call( elems[i], i ) : value ); + fn( elems[i], key, exec ? value.call( elems[i], i ) : value, pass ); } return elems; diff --git a/test/unit/attributes.js b/test/unit/attributes.js index cb48980..2a3d1e1 100644 --- a/test/unit/attributes.js +++ b/test/unit/attributes.js @@ -5,7 +5,7 @@ var functionReturningObj = function(value) { return (function() { return value; test("attr(String)", function() { expect(28); - + // This one sometimes fails randomly ?! equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' ); @@ -190,16 +190,16 @@ test("attr(jquery_method)", function(){ elem = $elem[0]; // one at a time - $elem.attr('html', 'foo'); + $elem.attr({'html': 'foo'}, true); equals( elem.innerHTML, 'foo', 'attr(html)'); - $elem.attr('text', 'bar'); + $elem.attr({'text': 'bar'}, true); equals( elem.innerHTML, 'bar', 'attr(text)'); - $elem.attr('css', {color:'red'}); + $elem.attr({'css': {color:'red'}}, true); ok( /^(#ff0000|red)$/i.test(elem.style.color), 'attr(css)'); - $elem.attr('height', 10); + $elem.attr({'height': 10}, true); equals( elem.style.height, '10px', 'attr(height)'); // Multiple attributes @@ -207,7 +207,7 @@ test("attr(jquery_method)", function(){ $elem.attr({ width:10, css:{ paddingLeft:1, paddingRight:1 } - }); + }, true); equals( elem.style.width, '10px', 'attr({...})'); equals( elem.style.paddingLeft, '1px', 'attr({...})'); diff --git a/test/unit/core.js b/test/unit/core.js index 1e03c96..1888e55 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -12,7 +12,7 @@ test("Basic requirements", function() { }); test("jQuery()", function() { - expect(15); + expect(22); // Basic constructor's behavior @@ -62,6 +62,22 @@ test("jQuery()", function() { equals( jQuery([1,2,3]).get(1), 2, "Test passing an array to the factory" ); equals( jQuery(document.body).get(0), jQuery('body').get(0), "Test passing an html node to the factory" ); + + var elem = jQuery("
", { + width: 10, + css: { paddingLeft:1, paddingRight:1 }, + text: "test", + "class": "test2", + id: "test3" + }); + + equals( elem[0].style.width, '10px', 'jQuery() quick setter width'); + equals( elem[0].style.paddingLeft, '1px', 'jQuery quick setter css'); + equals( elem[0].style.paddingRight, '1px', 'jQuery quick setter css'); + equals( elem[0].childNodes.length, 1, 'jQuery quick setter text'); + equals( elem[0].firstChild.nodeValue, "test", 'jQuery quick setter text'); + equals( elem[0].className, "test2", 'jQuery() quick setter class'); + equals( elem[0].id, "test3", 'jQuery() quick setter id'); }); test("selector state", function() { -- 1.7.10.4