deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make sure that &#...; entities are encoded properly. Fixes #6042.

Browse source
This commit is contained in:
jeresig 2010-02-05 19:58:08 -05:00
parent 54bd004e53
commit d743899971
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/manipulation.js
View file

@ -4,7 +4,7 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i, rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
rtagName = /<([\w:]+)/, rtagName = /<([\w:]+)/,
rtbody = /<tbody/i, rtbody = /<tbody/i,
rhtml = /<|&\w+;/, rhtml = /<|&#?\w+;/,
rnocache = /<script|<object|<embed/i, rnocache = /<script|<object|<embed/i,
rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, // checked="checked" or checked (html5) rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, // checked="checked" or checked (html5)
fcloseTag = function( all, front, tag ) { fcloseTag = function( all, front, tag ) {

5
test/unit/manipulation.js
View file

@ -851,7 +851,7 @@ test("clone() on XML nodes", function() {
} }
var testHtml = function(valueObj) { var testHtml = function(valueObj) {
expect(24); expect(26);
jQuery.scriptorder = 0; jQuery.scriptorder = 0;
@ -868,6 +868,9 @@ var testHtml = function(valueObj) {
equals( div.children().length, 2, "Make sure two child nodes exist." ); equals( div.children().length, 2, "Make sure two child nodes exist." );
equals( div.children().children().length, 1, "Make sure that a grandchild exists." ); equals( div.children().children().length, 1, "Make sure that a grandchild exists." );
equals( jQuery("<div/>").html(valueObj("&#160;"))[0].innerHTML, "&nbsp;", "Make sure entities are passed through correctly." );
equals( jQuery("<div/>").html(valueObj("&amp;"))[0].innerHTML, "&amp;", "Make sure entities are passed through correctly." );
reset(); reset();
// using contents will get comments regular, text, and comment nodes // using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents(); var j = jQuery("#nonnodes").contents();