Permalink
Browse files

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

Fixes gh-1997
Close gh-1998
  • Loading branch information...
Krinkle authored and timmywil committed Jan 7, 2015
1 parent d7e5fce commit 4116914dcac32868c2c822366785e3dd2ccc69d4
Showing with 11 additions and 6 deletions.
  1. +2 −2 src/core/parseHTML.js
  2. +9 −4 test/unit/core.js
View
@@ -15,8 +15,8 @@ define([
// defaults to document
// keepScripts (optional): If true, will include scripts passed in the html string
jQuery.parseHTML = function( data, context, keepScripts ) {
if ( !data || typeof data !== "string" ) {
return null;
if ( typeof data !== "string" ) {
return [];
}
if ( typeof context === "boolean" ) {
keepScripts = context;
View
@@ -1301,13 +1301,18 @@ test("jQuery.proxy", function(){
});
test("jQuery.parseHTML", function() {
expect( 18 );
expect( 23 );
var html, nodes;
equal( jQuery.parseHTML(), null, "Nothing in, null out." );
equal( jQuery.parseHTML( null ), null, "Null in, null out." );
equal( jQuery.parseHTML( "" ), null, "Empty string in, null out." );
deepEqual( jQuery.parseHTML(), [], "Without arguments" );
deepEqual( jQuery.parseHTML( undefined ), [], "Undefined" );
deepEqual( jQuery.parseHTML( null ), [], "Null" );
deepEqual( jQuery.parseHTML( false ), [], "Boolean false" );
deepEqual( jQuery.parseHTML( 0 ), [], "Zero" );
deepEqual( jQuery.parseHTML( true ), [], "Boolean true" );
deepEqual( jQuery.parseHTML( 42 ), [], "Positive number" );
deepEqual( jQuery.parseHTML( "" ), [], "Empty string" );
throws(function() {
jQuery.parseHTML( "<div></div>", document.getElementById("form") );
}, "Passing an element as the context raises an exception (context should be a document)");

0 comments on commit 4116914

Please sign in to comment.