Fixed the case where HTML that contained entities was being inserted as text strings...

diff --git a/src/manipulation.js b/src/manipulation.js
index eea377b7eb6c5f20e5fa05883c30220d42ecd45f..1699f680189012a72ea94334ea1e82affe6bf8de 100644 (file)
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -4,7 +4,7 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
        rselfClosing = /^(?:abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i,
        rtagName = /<([\w:]+)/,
        rtbody = /<tbody/i,
-       rhtml = /</,
+       rhtml = /<|&\w+;/,
        fcloseTag = function(all, front, tag){
                return rselfClosing.test(tag) ?
                        all :

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 00984168ca385de088031b221f029fc9128687fa..0f11de41c304f2882b7b8091b96393210b6d08c4 100644 (file)
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -643,7 +643,7 @@ test("val(Function)", function() {
 })
 
 var testHtml = function(valueObj) {
-       expect(17);
+       expect(20);
 
        window.debug = true;
 
@@ -676,6 +676,12 @@ var testHtml = function(valueObj) {
        equals( $div.html(valueObj( 5 )).html(), '5', 'Setting a number as html' );
        equals( $div.html(valueObj( 0 )).html(), '0', 'Setting a zero as html' );
 
+       var $div2 = jQuery('<div/>'), insert = "&lt;div&gt;hello1&lt;/div&gt;";
+       equals( $div2.html(insert).html(), insert, "Verify escaped insertion." );
+       equals( $div2.html("x" + insert).html(), "x" + insert, "Verify escaped insertion." );
+       equals( $div2.html(" " + insert).html(), " " + insert, "Verify escaped insertion." );
+
+
        reset();
 
        jQuery("#main").html(valueObj('<script type="something/else">ok( false, "Non-script evaluated." );</script><script type="text/javascript">ok( true, "text/javascript is evaluated." );</script><script>ok( true, "No type is evaluated." );</script><div><script type="text/javascript">ok( true, "Inner text/javascript is evaluated." );</script><script>ok( true, "Inner No type is evaluated." );</script><script type="something/else">ok( false, "Non-script evaluated." );</script></div>'));