diff --git a/src/core/parseHTML.js b/src/core/parseHTML.js index 6de02e8b6f..43befa709f 100644 --- a/src/core/parseHTML.js +++ b/src/core/parseHTML.js @@ -1,5 +1,4 @@ import { jQuery } from "../core.js"; -import { document } from "../var/document.js"; import { rsingleTag } from "./var/rsingleTag.js"; import { buildFragment } from "../manipulation/buildFragment.js"; import { isObviousHtml } from "./isObviousHtml.js"; @@ -17,20 +16,13 @@ jQuery.parseHTML = function( data, context, keepScripts ) { context = false; } - var base, parsed, scripts; + var parsed, scripts; if ( !context ) { // Stop scripts or inline event handlers from being executed immediately - // by using document.implementation - context = document.implementation.createHTMLDocument( "" ); - - // Set the base href for the created document - // so any parsed elements with URLs - // are based on the document's URL (gh-2965) - base = context.createElement( "base" ); - base.href = document.location.href; - context.head.appendChild( base ); + // by using DOMParser + context = ( new window.DOMParser() ).parseFromString( data, "text/html" ); } parsed = rsingleTag.exec( data ); diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js index 8300b4b9c2..a769ac57c3 100644 --- a/test/unit/manipulation.js +++ b/test/unit/manipulation.js @@ -3073,6 +3073,47 @@ QUnit.test( "Sanitized HTML doesn't get unsanitized", function( assert ) { } } ); +QUnit.test( "Parsing consistent with `document.write`", function( assert ) { + var domStructure; + + assert.expect( 1 ); + + function repeatString( str, count ) { + var ret = ""; + while ( count ) { + ret += str; + count--; + } + return ret; + } + + function serializeNodeNames( nodes, offset ) { + var i, node, + result = ""; + offset = offset || 0; + + for ( i = 0; i < nodes.length; i++ ) { + node = nodes[ i ]; + result += repeatString( " ", offset ) + node.nodeName.toLowerCase() + "\n"; + result += serializeNodeNames( node.childNodes, offset + 1 ); + } + + return result; + } + + domStructure = jQuery.parseHTML( + "" ); + + assert.strictEqual( serializeNodeNames( domStructure ), + "svg\n" + + "p\n" + + " style\n" + + " #text\n" + + " img\n" + + "", + "Parsing consistent with `document.write`" ); +} ); + QUnit.test( "Works with invalid attempts to close the table wrapper", function( assert ) { assert.expect( 3 );
" ); + + assert.strictEqual( serializeNodeNames( domStructure ), + "svg\n" + + "p\n" + + " style\n" + + " #text\n" + + " img\n" + + "", + "Parsing consistent with `document.write`" ); +} ); + QUnit.test( "Works with invalid attempts to close the table wrapper", function( assert ) { assert.expect( 3 );