Skip to content

Commit

Permalink
Manipulation: Bring tagname regexes up to spec
Browse files Browse the repository at this point in the history
Fixes gh-2005
Closes gh-2634
  • Loading branch information
LeonardoBraga authored and gibson042 committed Jan 7, 2016
1 parent df822ca commit fb9472c
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/core/var/rsingleTag.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define( function() {

// Match a standalone tag
return ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ );
return ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
} );
2 changes: 1 addition & 1 deletion src/manipulation.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ define( [
dataPriv, dataUser, acceptData, DOMEval ) {

var
rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,

// Support: IE 10-11, Edge 10240+
// In IE/Edge using regex groups here causes severe slowdowns.
Expand Down
2 changes: 1 addition & 1 deletion src/manipulation/var/rtagName.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
define( function() {
return ( /<([\w:-]+)/ );
return ( /<([a-z][^\/\0>\x20\t\r\n\f]+)/i );
} );
67 changes: 67 additions & 0 deletions test/unit/manipulation.js
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,73 @@ QUnit.test( "html(String) tag-hyphenated elements (Bug #1987)", function( assert
assert.equal( j.children().text(), "text", "Tags with multiple hypens behave normally" );
} );

QUnit.test( "Tag name processing respects the HTML Standard (gh-2005)", function( assert ) {

assert.expect( 240 );

var wrapper = jQuery( "<div></div>" ),
nameTerminatingChars = "\x20\t\r\n\f".split( "" ),
specialChars = "[ ] { } _ - = + \\ ( ) * & ^ % $ # @ ! ~ ` ' ; ? ¥ « µ λ ⊕ ≈ ξ ℜ ♣ €"
.split( " " );

specialChars.push( specialChars.join( "" ) );

jQuery.each( specialChars, function( i, characters ) {
assertSpecialCharsSupport( "html", characters );
assertSpecialCharsSupport( "append", characters );
} );

jQuery.each( nameTerminatingChars, function( i, character ) {
assertNameTerminatingCharsHandling( "html", character );
assertNameTerminatingCharsHandling( "append", character );
} );

function buildChild( method, html ) {
wrapper[ method ]( html );
return wrapper.children()[ 0 ];
}

function assertSpecialCharsSupport( method, characters ) {
var child,
codepoint = characters.charCodeAt( 0 ).toString( 16 ).toUpperCase(),
description = characters.length === 1 ?
"U+" + ( "000" + codepoint ).slice( -4 ) + " " + characters :
"all special characters",
nodeName = "valid" + characters + "tagname";

child = buildChild( method, "<" + nodeName + "></" + nodeName + ">" );
assert.equal( child.nodeName.toUpperCase(), nodeName.toUpperCase(),
method + "(): Paired tag name includes " + description );

child = buildChild( method, "<" + nodeName + ">" );
assert.equal( child.nodeName.toUpperCase(), nodeName.toUpperCase(),
method + "(): Unpaired tag name includes " + description );

child = buildChild( method, "<" + nodeName + "/>" );
assert.equal( child.nodeName.toUpperCase(), nodeName.toUpperCase(),
method + "(): Self-closing tag name includes " + description );
}

function assertNameTerminatingCharsHandling( method, character ) {
var child,
codepoint = character.charCodeAt( 0 ).toString( 16 ).toUpperCase(),
description = "U+" + ( "000" + codepoint ).slice( -4 ) + " " + character,
nodeName = "div" + character + "this-will-be-discarded";

child = buildChild( method, "<" + nodeName + "></" + nodeName + ">" );
assert.equal( child.nodeName.toUpperCase(), "DIV",
method + "(): Paired tag name terminated by " + description );

child = buildChild( method, "<" + nodeName + ">" );
assert.equal( child.nodeName.toUpperCase(), "DIV",
method + "(): Unpaired open tag name terminated by " + description );

child = buildChild( method, "<" + nodeName + "/>" );
assert.equal( child.nodeName.toUpperCase(), "DIV",
method + "(): Self-closing tag name terminated by " + description );
}
} );

QUnit.test( "IE8 serialization bug", function( assert ) {

assert.expect( 2 );
Expand Down

0 comments on commit fb9472c

Please sign in to comment.