Revert "Core: Return empty array instead of null for parseHTML("")"

This reverts commit 4116914dcac32868c2c822366785e3dd2ccc69d4.

diff --git a/src/core/parseHTML.js b/src/core/parseHTML.js
index 30405363ccf171d2849da093fe48de436aff49ae..87c2147d14a53dda2c10c34f0246a62e2f07972f 100644 (file)
--- a/src/core/parseHTML.js
+++ b/src/core/parseHTML.js
@@ -13,8 +13,8 @@ define( [
 // defaults to document
 // keepScripts (optional): If true, will include scripts passed in the html string
 jQuery.parseHTML = function( data, context, keepScripts ) {
-       if ( typeof data !== "string" ) {
-               return [];
+       if ( !data || typeof data !== "string" ) {
+               return null;
        }
        if ( typeof context === "boolean" ) {
                keepScripts = context;

diff --git a/test/unit/core.js b/test/unit/core.js
index e2b4d1b552f54f688638304eff8aeaf9a0e265a6..49ad24023451e16c21f6b732a5b4b9ae05da193c 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1470,50 +1470,45 @@ QUnit.test( "jQuery.proxy", function( assert ) {
        cb.call( thisObject, "arg3" );
 } );
 
-QUnit.test( "jQuery.parseHTML", function( assert ) {
-       assert.expect( 23 );
+QUnit.test("jQuery.parseHTML", function( assert ) {
+       assert.expect( 18 );
 
        var html, nodes;
 
-       assert.deepEqual( jQuery.parseHTML(), [], "Without arguments" );
-       assert.deepEqual( jQuery.parseHTML( undefined ), [], "Undefined" );
-       assert.deepEqual( jQuery.parseHTML( null ), [], "Null" );
-       assert.deepEqual( jQuery.parseHTML( false ), [], "Boolean false" );
-       assert.deepEqual( jQuery.parseHTML( 0 ), [], "Zero" );
-       assert.deepEqual( jQuery.parseHTML( true ), [], "Boolean true" );
-       assert.deepEqual( jQuery.parseHTML( 42 ), [], "Positive number" );
-       assert.deepEqual( jQuery.parseHTML( "" ), [], "Empty string" );
-       assert.throws( function() {
-               jQuery.parseHTML( "<div></div>", document.getElementById( "form" ) );
-       }, "Passing an element as the context raises an exception (context should be a document)" );
+       assert.equal( jQuery.parseHTML(), null, "Nothing in, null out." );
+       assert.equal( jQuery.parseHTML( null ), null, "Null in, null out." );
+       assert.equal( jQuery.parseHTML( "" ), null, "Empty string in, null out." );
+       throws(function() {
+               jQuery.parseHTML( "<div></div>", document.getElementById("form") );
+       }, "Passing an element as the context raises an exception (context should be a document)");
 
-       nodes = jQuery.parseHTML( jQuery( "body" )[ 0 ].innerHTML );
+       nodes = jQuery.parseHTML( jQuery("body")[0].innerHTML );
        assert.ok( nodes.length > 4, "Parse a large html string" );
        assert.equal( jQuery.type( nodes ), "array", "parseHTML returns an array rather than a nodelist" );
 
        html = "<script>undefined()</script>";
        assert.equal( jQuery.parseHTML( html ).length, 0, "Ignore scripts by default" );
-       assert.equal( jQuery.parseHTML( html, true )[ 0 ].nodeName.toLowerCase(), "script", "Preserve scripts when requested" );
+       assert.equal( jQuery.parseHTML( html, true )[0].nodeName.toLowerCase(), "script", "Preserve scripts when requested" );
 
        html += "<div></div>";
-       assert.equal( jQuery.parseHTML( html )[ 0 ].nodeName.toLowerCase(), "div", "Preserve non-script nodes" );
-       assert.equal( jQuery.parseHTML( html, true )[ 0 ].nodeName.toLowerCase(), "script", "Preserve script position" );
+       assert.equal( jQuery.parseHTML( html )[0].nodeName.toLowerCase(), "div", "Preserve non-script nodes" );
+       assert.equal( jQuery.parseHTML( html, true )[0].nodeName.toLowerCase(), "script", "Preserve script position");
 
-       assert.equal( jQuery.parseHTML( "text" )[ 0 ].nodeType, 3, "Parsing text returns a text node" );
-       assert.equal( jQuery.parseHTML( "\t<div></div>" )[ 0 ].nodeValue, "\t", "Preserve leading whitespace" );
+       assert.equal( jQuery.parseHTML("text")[0].nodeType, 3, "Parsing text returns a text node" );
+       assert.equal( jQuery.parseHTML( "\t<div></div>" )[0].nodeValue, "\t", "Preserve leading whitespace" );
 
-       assert.equal( jQuery.parseHTML( " <div/> " )[ 0 ].nodeType, 3, "Leading spaces are treated as text nodes (#11290)" );
+       assert.equal( jQuery.parseHTML(" <div/> ")[0].nodeType, 3, "Leading spaces are treated as text nodes (#11290)" );
 
        html = jQuery.parseHTML( "<div>test div</div>" );
 
        assert.equal( html[ 0 ].parentNode.nodeType, 11, "parentNode should be documentFragment" );
        assert.equal( html[ 0 ].innerHTML, "test div", "Content should be preserved" );
 
-       assert.equal( jQuery.parseHTML( "<span><span>" ).length, 1, "Incorrect html-strings should not break anything" );
-       assert.equal( jQuery.parseHTML( "<td><td>" )[ 1 ].parentNode.nodeType, 11,
+       assert.equal( jQuery.parseHTML("<span><span>").length, 1, "Incorrect html-strings should not break anything" );
+       assert.equal( jQuery.parseHTML("<td><td>")[ 1 ].parentNode.nodeType, 11,
                "parentNode should be documentFragment for wrapMap (variable in manipulation module) elements too" );
-       assert.ok( jQuery.parseHTML( "<#if><tr><p>This is a test.</p></tr><#/if>" ) || true, "Garbage input should not cause error" );
-} );
+       assert.ok( jQuery.parseHTML("<#if><tr><p>This is a test.</p></tr><#/if>") || true, "Garbage input should not cause error" );
+});
 
 if ( jQuery.support.createHTMLDocument ) {
        QUnit.asyncTest( "jQuery.parseHTML", function( assert ) {