Skip to content

Commit 1d61fd9

Browse files
mgolmgol
committed
Manipulation: Make jQuery.htmlPrefilter an identity function
Closes gh-4642 (cherry picked from />" ).appendTo( "#qunit-fixture" );
101+
jQuery( "<a id='tAnchor6' href='#5'></a>" ).appendTo( "#qunit-fixture" );
102102
assert.equal( jQuery( "#tAnchor5" ).prop( "href" ), jQuery( "#tAnchor6" ).prop( "href" ), "Check for absolute href prop on an anchor" );
103103

104104
jQuery( "<script type='jquery/test' src='#5' id='scriptSrc'></script>" ).appendTo( "#qunit-fixture" );
@@ -136,7 +136,7 @@ QUnit.test( "attr(String)", function( assert ) {
136136
assert.equal( $img.attr( "height" ), "53", "Retrieve height attribute on an element with display:none." );
137137

138138
// Check for style support
139-
styleElem = jQuery( "<div/>" ).appendTo( "#qunit-fixture" ).css( {
139+
styleElem = jQuery( "<div></div>" ).appendTo( "#qunit-fixture" ).css( {
140140
background: "url(UPPERlower.gif)"
141141
} );
142142
assert.ok( !!~styleElem.attr( "style" ).indexOf( "UPPERlower.gif" ), "Check style attribute getter" );
@@ -158,11 +158,11 @@ QUnit.test( "attr(String)", function( assert ) {
158158
$a = jQuery( "<a href='#' onclick='something()'>Click</a>" ).appendTo( "#qunit-fixture" );
159159
assert.equal( $a.attr( "onclick" ), "something()", "Retrieve ^on attribute without anonymous function wrapper." );
160160

161-
assert.ok( jQuery( "<div/>" ).attr( "doesntexist" ) === undefined, "Make sure undefined is returned when no attribute is found." );
162-
assert.ok( jQuery( "<div/>" ).attr( "title" ) === undefined, "Make sure undefined is returned when no attribute is found." );
163-
assert.equal( jQuery( "<div/>" ).attr( "title", "something" ).attr( "title" ), "something", "Set the title attribute." );
161+
assert.ok( jQuery( "<div></div>" ).attr( "doesntexist" ) === undefined, "Make sure undefined is returned when no attribute is found." );
162+
assert.ok( jQuery( "<div></div>" ).attr( "title" ) === undefined, "Make sure undefined is returned when no attribute is found." );
163+
assert.equal( jQuery( "<div></div>" ).attr( "title", "something" ).attr( "title" ), "something", "Set the title attribute." );
164164
assert.ok( jQuery().attr( "doesntexist" ) === undefined, "Make sure undefined is returned when no element is there." );
165-
assert.equal( jQuery( "<div/>" ).attr( "value" ), undefined, "An unset value on a div returns undefined." );
165+
assert.equal( jQuery( "<div></div>" ).attr( "value" ), undefined, "An unset value on a div returns undefined." );
166166
assert.strictEqual( jQuery( "<select><option value='property'></option></select>" ).attr( "value" ), undefined, "An unset value on a select returns undefined." );
167167

168168
$form = jQuery( "#form" ).attr( "enctype", "multipart/form-data" );
@@ -180,7 +180,7 @@ QUnit.test( "attr(String) on cloned elements, #9646", function( assert ) {
180180

181181
assert.strictEqual( input.clone( true ).attr( "name", "test" )[ 0 ].name, "test", "Name attribute should be changed on cloned element" );
182182

183-
div = jQuery( "<div id='tester' />" );
183+
div = jQuery( "<div id='tester'></div>" );
184184
div.attr( "id" );
185185

186186
assert.strictEqual( div.clone( true ).attr( "id", "test" )[ 0 ].id, "test", "Id attribute should be changed on cloned element" );
@@ -299,7 +299,7 @@ QUnit.test( "attr(String, Object)", function( assert ) {
299299
$input = jQuery( "<input type='checkbox'/>" ).attr( "checked", true );
300300
assert.equal( $input.prop( "checked" ), true, "Setting checked updates property (verified by .prop)" );
301301
assert.equal( $input[ 0 ].checked, true, "Setting checked updates property (verified by native property)" );
302-
$input = jQuery( "<option/>" ).attr( "selected", true );
302+
$input = jQuery( "<option></option>" ).attr( "selected", true );
303303
assert.equal( $input.prop( "selected" ), true, "Setting selected updates property (verified by .prop)" );
304304
assert.equal( $input[ 0 ].selected, true, "Setting selected updates property (verified by native property)" );
305305

@@ -592,7 +592,7 @@ QUnit.test( "removeAttr(String)", function( assert ) {
592592
assert.expect( 12 );
593593
var $first;
594594

595-
assert.equal( jQuery( "<div class='hello' />" ).removeAttr( "class" ).attr( "class" ), undefined, "remove class" );
595+
assert.equal( jQuery( "<div class='hello'></div>" ).removeAttr( "class" ).attr( "class" ), undefined, "remove class" );
596596
assert.equal( jQuery( "#form" ).removeAttr( "id" ).attr( "id" ), undefined, "Remove id" );
597597
assert.equal( jQuery( "#foo" ).attr( "style", "position:absolute;" ).removeAttr( "style" ).attr( "style" ), undefined, "Check removing style attribute" );
598598
assert.equal( jQuery( "#form" ).attr( "style", "position:absolute;" ).removeAttr( "style" ).attr( "style" ), undefined, "Check removing style attribute on a form" );
@@ -692,7 +692,7 @@ QUnit.test( "prop(String, Object)", function( assert ) {
692692
assert.equal( jQuery( "#select2" ).prop( "selectedIndex" ), 3, "Check for selectedIndex attribute" );
693693
assert.equal( jQuery( "#foo" ).prop( "nodeName" ).toUpperCase(), "DIV", "Check for nodeName attribute" );
694694
assert.equal( jQuery( "#foo" ).prop( "tagName" ).toUpperCase(), "DIV", "Check for tagName attribute" );
695-
assert.equal( jQuery( "<option/>" ).prop( "selected" ), false, "Check selected attribute on disconnected element." );
695+
assert.equal( jQuery( "<option></option>" ).prop( "selected" ), false, "Check selected attribute on disconnected element." );
696696

697697
assert.equal( jQuery( "#listWithTabIndex" ).prop( "tabindex" ), 5, "Check retrieving tabindex" );
698698
jQuery( "#text1" ).prop( "readonly", true );
@@ -837,16 +837,16 @@ QUnit.test( "option.prop('selected', true) affects select.selectedIndex (gh-2732
837837

838838
function addOptions( $elem ) {
839839
return $elem.append(
840-
jQuery( "<option/>" ).val( "a" ).text( "One" ),
841-
jQuery( "<option/>" ).val( "b" ).text( "Two" ),
842-
jQuery( "<option/>" ).val( "c" ).text( "Three" )
840+
jQuery( "<option></option>" ).val( "a" ).text( "One" ),
841+
jQuery( "<option></option>" ).val( "b" ).text( "Two" ),
842+
jQuery( "<option></option>" ).val( "c" ).text( "Three" )
843843
)
844844
.find( "[value=a]" ).prop( "selected", true ).end()
845845
.find( "[value=c]" ).prop( "selected", true ).end();
846846
}
847847

848848
var $optgroup,
849-
$select = jQuery( "<select/>" );
849+
$select = jQuery( "<select></select>" );
850850

851851
// Check select with options
852852
addOptions( $select ).appendTo( "#qunit-fixture" );
@@ -856,7 +856,7 @@ QUnit.test( "option.prop('selected', true) affects select.selectedIndex (gh-2732
856856
$select.empty();
857857

858858
// Check select with optgroup
859-
$optgroup = jQuery( "<optgroup/>" );
859+
$optgroup = jQuery( "<optgroup></optgroup>" );
860860
addOptions( $optgroup ).appendTo( $select );
861861
$select.find( "[value=b]" ).prop( "selected", true );
862862

@@ -970,7 +970,7 @@ QUnit.test( "val()", function( assert ) {
970970
assert.equal( $button.val(), "foobar", "Value retrieval on a button does not return innerHTML" );
971971
assert.equal( $button.val( "baz" ).html(), "text", "Setting the value does not change innerHTML" );
972972

973-
assert.equal( jQuery( "<option/>" ).val( "test" ).attr( "value" ), "test", "Setting value sets the value attribute" );
973+
assert.equal( jQuery( "<option></option>" ).val( "test" ).attr( "value" ), "test", "Setting value sets the value attribute" );
974974
} );
975975

976976
QUnit.test( "val() with non-matching values on dropdown list", function( assert ) {
@@ -1029,7 +1029,7 @@ var testVal = function( valueObj, assert ) {
10291029
assert.equal( document.getElementById( "text1" ).value, "", "Check for modified (via val(null)) value of input element" );
10301030

10311031
var j,
1032-
$select = jQuery( "<select multiple><option value='1'/><option value='2'/></select>" ),
1032+
$select = jQuery( "<select multiple><option value='1'></option><option value='2'></option></select>" ),
10331033
$select1 = jQuery( "#select1" );
10341034

10351035
$select1.val( valueObj( "3" ) );
@@ -1145,7 +1145,7 @@ QUnit.test( "val(select) after form.reset() (Bug #2551)", function( assert ) {
11451145
QUnit.test( "select.val(space characters) (gh-2978)", function( assert ) {
11461146
assert.expect( 37 );
11471147

1148-
var $select = jQuery( "<select/>" ).appendTo( "#qunit-fixture" ),
1148+
var $select = jQuery( "<select></select>" ).appendTo( "#qunit-fixture" ),
11491149
spaces = {
11501150
"\\t": {
11511151
html: "&#09;",
@@ -1230,7 +1230,7 @@ var testAddClass = function( valueObj, assert ) {
12301230
j.addClass( valueObj( "asdf" ) );
12311231
assert.ok( j.hasClass( "asdf" ), "Check node,textnode,comment for addClass" );
12321232

1233-
div = jQuery( "<div/>" );
1233+
div = jQuery( "<div></div>" );
12341234

12351235
div.addClass( valueObj( "test" ) );
12361236
assert.equal( div.attr( "class" ), "test", "Make sure there's no extra whitespace." );
@@ -1669,17 +1669,17 @@ QUnit.test( "coords returns correct values in IE6/IE7, see #10828", function( as
16691669
assert.expect( 1 );
16701670

16711671
var area,
1672-
map = jQuery( "<map />" );
1672+
map = jQuery( "<map></map>" );
16731673

1674-
area = map.html( "<area shape='rect' coords='0,0,0,0' href='#' alt='a' />" ).find( "area" );
1674+
area = map.html( "<area shape='rect' coords='0,0,0,0' href='#' alt='a'></area>" ).find( "area" );
16751675
assert.equal( area.attr( "coords" ), "0,0,0,0", "did not retrieve coords correctly" );
16761676
} );
16771677

16781678
QUnit.test( "should not throw at $(option).val() (#14686)", function( assert ) {
16791679
assert.expect( 1 );
16801680

16811681
try {
1682-
jQuery( "<option/>" ).val();
1682+
jQuery( "<option></option>" ).val();
16831683
assert.ok( true );
16841684
} catch ( _ ) {
16851685
assert.ok( false );

‎test/unit/basic.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ QUnit.test( "ajax", function( assert ) {
3636
QUnit.test( "attributes", function( assert ) {
3737
assert.expect( 6 );
3838

39-
var a = jQuery( "<a/>" ).appendTo( "#qunit-fixture" ),
39+
var a = jQuery( "<a></a>" ).appendTo( "#qunit-fixture" ),
4040
input = jQuery( "<input/>" ).appendTo( "#qunit-fixture" );
4141

4242
assert.strictEqual( a.attr( "foo", "bar" ).attr( "foo" ), "bar", ".attr getter/setter" );
@@ -56,7 +56,7 @@ if ( jQuery.css ) {
5656
QUnit.test( "css", function( assert ) {
5757
assert.expect( 1 );
5858

59-
var div = jQuery( "<div/>" ).appendTo( "#qunit-fixture" );
59+
var div = jQuery( "<div></div>" ).appendTo( "#qunit-fixture" );
6060

6161
assert.strictEqual( div.css( "width", "50px" ).css( "width" ), "50px", ".css getter/setter" );
6262
} );
@@ -66,7 +66,7 @@ if ( jQuery.fn.show && jQuery.fn.hide ) {
6666
QUnit.test( "show/hide", function( assert ) {
6767
assert.expect( 2 );
6868

69-
var div = jQuery( "<div/>" ).appendTo( "#qunit-fixture" );
69+
var div = jQuery( "<div></div>" ).appendTo( "#qunit-fixture" );
7070

7171
div.hide();
7272
assert.strictEqual( div.css( "display" ), "none", "div hidden" );
@@ -126,7 +126,7 @@ QUnit.test( "core", function( assert ) {
126126
QUnit.test( "data", function( assert ) {
127127
assert.expect( 4 );
128128

129-
var elem = jQuery( "<div data-c='d'/>" ).appendTo( "#qunit-fixture" );
129+
var elem = jQuery( "<div data-c='d'></div>" ).appendTo( "#qunit-fixture" );
130130

131131
assert.ok( !jQuery.hasData( elem[ 0 ] ), "jQuery.hasData - false" );
132132
assert.strictEqual( elem.data( "a", "b" ).data( "a" ), "b", ".data getter/setter" );
@@ -138,7 +138,7 @@ QUnit.test( "dimensions", function( assert ) {
138138
assert.expect( 3 );
139139

140140
var elem = jQuery(
141-
"<div style='margin: 10px; padding: 7px; border: 2px solid black;' /> "
141+
"<div style='margin: 10px; padding: 7px; border: 2px solid black;'></div> "
142142
).appendTo( "#qunit-fixture" );
143143

144144
assert.strictEqual( elem.width( 50 ).width(), 50, ".width getter/setter" );
@@ -149,7 +149,7 @@ QUnit.test( "dimensions", function( assert ) {
149149
QUnit.test( "event", function( assert ) {
150150
assert.expect( 1 );
151151

152-
var elem = jQuery( "<div/>" ).appendTo( "#qunit-fixture" );
152+
var elem = jQuery( "<div></div>" ).appendTo( "#qunit-fixture" );
153153

154154
elem
155155
.on( "click", function() {
@@ -168,12 +168,12 @@ QUnit.test( "manipulation", function( assert ) {
168168

169169
var child,
170170
elem1 = jQuery( "<div><span></span></div>" ).appendTo( "#qunit-fixture" ),
171-
elem2 = jQuery( "<div/>" ).appendTo( "#qunit-fixture" );
171+
elem2 = jQuery( "<div></div>" ).appendTo( "#qunit-fixture" );
172172

173173
assert.strictEqual( elem1.text( "foo" ).text(), "foo", ".html getter/setter" );
174174

175175
assert.strictEqual(
176-
elem1.html( "<span/>" ).html(),
176+
elem1.html( "<span></span>" ).html(),
177177
"<span></span>",
178178
".html getter/setter"
179179
);
@@ -182,8 +182,8 @@ QUnit.test( "manipulation", function( assert ) {
182182
assert.strictEqual( elem1.prepend( elem2 )[ 0 ].childNodes[ 0 ], elem2[ 0 ], ".prepend" );
183183

184184
child = elem1.find( "span" );
185-
child.after( "<a/>" );
186-
child.before( "<b/>" );
185+
child.after( "<a></a>" );
186+
child.before( "<b></b>" );
187187

188188
assert.strictEqual(
189189
elem1.html(),
@@ -197,8 +197,8 @@ QUnit.test( "manipulation", function( assert ) {
197197
QUnit[ /jsdom\//.test( navigator.userAgent ) ? "skip" : "test" ]( "offset", function( assert ) {
198198
assert.expect( 3 );
199199

200-
var parent = jQuery( "<div style='position:fixed;top:20px;'/>" ).appendTo( "#qunit-fixture" ),
201-
elem = jQuery( "<div style='position:absolute;top:5px;'/>" ).appendTo( parent );
200+
var parent = jQuery( "<div style='position:fixed;top:20px;'></div>" ).appendTo( "#qunit-fixture" ),
201+
elem = jQuery( "<div style='position:absolute;top:5px;'></div>" ).appendTo( parent );
202202

203203
assert.strictEqual( elem.offset().top, 25, ".offset getter" );
204204
assert.strictEqual( elem.position().top, 5, ".position getter" );

‎test/unit/core.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ QUnit.test( "jQuery()", function( assert ) {
2323

2424
var elem, i,
2525
obj = jQuery( "div" ),
26-
code = jQuery( "<code/>" ),
26+
code = jQuery( "<code></code>" ),
2727
img = jQuery( "<img/>" ),
28-
div = jQuery( "<div/><hr/><code/><b/>" ),
28+
div = jQuery( "<div></div><hr/><code></code><b/>" ),
2929
exec = false,
3030
expected = 23,
3131
attrObj = {
@@ -113,7 +113,7 @@ QUnit.test( "jQuery()", function( assert ) {
113113
elem = jQuery( "\n\n<em>world</em>" )[ 0 ];
114114
assert.equal( elem.nodeName.toLowerCase(), "em", "leading newlines" );
115115

116-
elem = jQuery( "<div/>", attrObj );
116+
elem = jQuery( "<div></div>", attrObj );
117117

118118
if ( jQuery.fn.width ) {
119119
assert.equal( elem[ 0 ].style.width, "10px", "jQuery() quick setter width" );
@@ -458,7 +458,7 @@ QUnit.test( "jQuery('html')", function( assert ) {
458458

459459
assert.ok( jQuery( "<link rel='stylesheet'/>" )[ 0 ], "Creating a link" );
460460

461-
assert.ok( !jQuery( "<script/>" )[ 0 ].parentNode, "Create a script" );
461+
assert.ok( !jQuery( "<script></script>" )[ 0 ].parentNode, "Create a script" );
462462

463463
assert.ok( jQuery( "<input/>" ).attr( "type", "hidden" ), "Create an input and set the type." );
464464

@@ -526,8 +526,8 @@ QUnit.test( "jQuery('massive html #7990')", function( assert ) {
526526
QUnit.test( "jQuery('html', context)", function( assert ) {
527527
assert.expect( 1 );
528528

529-
var $div = jQuery( "<div/>" )[ 0 ],
530-
$span = jQuery( "<span/>", $div );
529+
var $div = jQuery( "<div></div>" )[ 0 ],
530+
$span = jQuery( "<span></span>", $div );
531531
assert.equal( $span.length, 1, "verify a span created with a div context works, #1763" );
532532
} );
533533

@@ -1356,7 +1356,7 @@ QUnit.test( "jQuery.parseHTML", function( assert ) {
13561356
assert.equal( jQuery.parseHTML( "text" )[ 0 ].nodeType, 3, "Parsing text returns a text node" );
13571357
assert.equal( jQuery.parseHTML( "\t<div></div>" )[ 0 ].nodeValue, "\t", "Preserve leading whitespace" );
13581358

1359-
assert.equal( jQuery.parseHTML( " <div/> " )[ 0 ].nodeType, 3, "Leading spaces are treated as text nodes (#11290)" );
1359+
assert.equal( jQuery.parseHTML( " <div></div> " )[ 0 ].nodeType, 3, "Leading spaces are treated as text nodes (#11290)" );
13601360

13611361
html = jQuery.parseHTML( "<div>test div</div>" );
13621362

0 commit comments

Comments
 (0)