github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-01 16:24:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes gh-1997
Close gh-1998

Conflicts:
	test/unit/core.js
This commit is contained in:
Timo Tijhof
2015-01-07 20:12:49 +00:00
committed by Timmy Willison
parent 30ace26c42
commit 61bb61279c
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/parseHTML.js
View File

@@ -14,8 +14,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;

13
test/unit/core.js
View File

@@ -1285,13 +1285,18 @@ test("jQuery.proxy", function(){
});
test("jQuery.parseHTML", function() {
expect( 17 );
expect( 22 );
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)");