library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Adjust jQuery('html') detection to only match when html starts with '<' (counting space characters). Fixes #11290"

Browse Source 
This reverts commit 239fc86b01.

The consensus is that this would change behavior too abruptly. We will warn in 1.8 and do this in 1.9.
This commit is contained in:
timmywil 2012-06-20 16:19:06 -04:00
parent bc9945a6a4
commit c20e031058
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core.js
View File

@ -40,8 +40,9 @@ var
trimRight = /\s+$/, trimRight = /\s+$/,
// A simple way to check for HTML strings // A simple way to check for HTML strings
// If starts-with '<' // Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
rhtmlString = /^\s*(<[\w\W]+>)[^>]*$/, // Ignore html if within quotes "" '' or brackets/parens [] ()
rhtmlString = /^(?:[^#<\\]*(<[\w\W]+>)(?![^\[]*\])(?![^\(]*\))(?![^']*')(?![^"]*")[^>]*$)/,
// Match a standalone tag // Match a standalone tag
rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,

4
test/unit/core.js
View File

@ -27,7 +27,7 @@ test("jQuery()", function() {
div = jQuery("<div/><hr/><code/><b/>"), div = jQuery("<div/><hr/><code/><b/>"),
exec = false, exec = false,
long = "", long = "",
expected = 24, expected = 26,
attrObj = { attrObj = {
click: function() { ok( exec, "Click executed." ); }, click: function() { ok( exec, "Click executed." ); },
text: "test", text: "test",
@ -132,12 +132,14 @@ test("jQuery()", function() {
elem.remove(); elem.remove();
equal( jQuery(" <div/> ").length, 1, "Make sure whitespace is trimmed." ); equal( jQuery(" <div/> ").length, 1, "Make sure whitespace is trimmed." );
equal( jQuery(" a<div/>b ").length, 1, "Make sure whitespace and other characters are trimmed." );
for ( i = 0; i < 128; i++ ) { for ( i = 0; i < 128; i++ ) {
long += "12345678"; long += "12345678";
} }
equal( jQuery(" <div>" + long + "</div> ").length, 1, "Make sure whitespace is trimmed on long strings." ); equal( jQuery(" <div>" + long + "</div> ").length, 1, "Make sure whitespace is trimmed on long strings." );
equal( jQuery(" a<div>" + long + "</div>b ").length, 1, "Make sure whitespace and other characters are trimmed on long strings." );
}); });
test("selector state", function() { test("selector state", function() {