Permalink
Browse files

Core: re-introduce createHTMLDocument in parseHTML; Safari 8 left out

Close gh-1505
  • Loading branch information...
timmywil committed Dec 10, 2014
1 parent 8653068 commit cfe468f29c4cbe1a457d0feb17dec90dcfd7c280
Showing with 67 additions and 6 deletions.
  1. +11 −3 src/core/parseHTML.js
  2. +12 −0 src/core/support.js
  3. +1 −1 test/data/testinit.js
  4. +17 −1 test/unit/core.js
  5. +26 −1 test/unit/support.js
View
@@ -2,8 +2,12 @@ define([
"../core",
"./var/rsingleTag",
"../manipulation" // buildFragment
], function( jQuery, rsingleTag ) {
// This is the only module that needs core/support
"./support",
// buildFragment
"../manipulation"
], function( jQuery, rsingleTag, support ) {
// data: string of html
// context (optional): If specified, the fragment will be created in this context,
@@ -17,7 +21,11 @@ jQuery.parseHTML = function( data, context, keepScripts ) {
keepScripts = context;
context = false;
}
context = context || document;
// document.implementation stops scripts or inline event handlers from
// being executed immediately
context = context || ( support.createHTMLDocument ?
document.implementation.createHTMLDocument( "" ) :
document );
var parsed = rsingleTag.exec( data ),
scripts = !keepScripts && [];
View
@@ -0,0 +1,12 @@
define([
"../var/support"
], function( support ) {
support.createHTMLDocument = (function() {
var doc = document.implementation.createHTMLDocument( "" );
doc.body.innerHTML = "<form></form><form></form>";

This comment has been minimized.

Show comment
Hide comment
@phistuck

phistuck Jul 15, 2015

Perhaps add a comment here?

@phistuck

phistuck Jul 15, 2015

Perhaps add a comment here?

This comment has been minimized.

Show comment
Hide comment
@mgol

mgol Jul 16, 2015

Member

Yeah, it should mention Safari 8 explicitely. 👍

@mgol

mgol Jul 16, 2015

Member

Yeah, it should mention Safari 8 explicitely. 👍

This comment has been minimized.

Show comment
Hide comment
@mgol

mgol Jul 20, 2015

Member

Added in d242753 on master & 9c373c3 on compat. Thanks for noticing!

@mgol

mgol Jul 20, 2015

Member

Added in d242753 on master & 9c373c3 on compat. Thanks for noticing!

return doc.body.childNodes.length === 2;
})();
return support;
});
View
@@ -301,7 +301,7 @@ this.loadTests = function() {
/**
* Run in noConflict mode
*/
if (jQuery.noConflict) {
if ( jQuery.noConflict ) {
jQuery.noConflict();
}
View
@@ -235,7 +235,7 @@ test( "globalEval execution after script injection (#7862)", 1, function() {
});
// This is not run in AMD mode
if (jQuery.noConflict) {
if ( jQuery.noConflict ) {
test("noConflict", function() {
expect(7);
@@ -1370,6 +1370,22 @@ test("jQuery.parseHTML", function() {
ok( jQuery.parseHTML("<#if><tr><p>This is a test.</p></tr><#/if>") || true, "Garbage input should not cause error" );
});
if ( jQuery.support.createHTMLDocument ) {
asyncTest("jQuery.parseHTML", function() {
expect ( 1 );
Globals.register("parseHTMLError");
jQuery.globalEval("parseHTMLError = false;");
jQuery.parseHTML( "<img src=x onerror='parseHTMLError = true'>" );
window.setTimeout(function() {
start();
equal( window.parseHTMLError, false, "onerror eventhandler has not been called." );
}, 2000);
});
}
test("jQuery.parseJSON", function() {
expect( 20 );
View
@@ -61,6 +61,7 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
"checkOn": true,
"clearCloneStyle": true,
"cors": true,
"createHTMLDocument": true,
"focusinBubbles": false,
"noCloneChecked": true,
"optDisabled": true,
@@ -77,6 +78,7 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
"checkOn": true,
"clearCloneStyle": false,
"cors": true,
"createHTMLDocument": true,
"focusinBubbles": true,
"noCloneChecked": false,
"optDisabled": true,
@@ -93,6 +95,7 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
"checkOn": true,
"clearCloneStyle": false,
"cors": false,
"createHTMLDocument": true,
"focusinBubbles": true,
"noCloneChecked": false,
"optDisabled": true,
@@ -101,14 +104,32 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
"radioValue": false,
"reliableMarginRight": true
};
} else if ( /(6|7|8)\.0(\.\d+|) safari/i.test( userAgent ) ) {
} else if ( /(6|7)\.0(\.\d+|) safari/i.test( userAgent ) ) {
expected = {
"ajax": true,
"boxSizingReliable": true,
"checkClone": true,
"checkOn": true,
"clearCloneStyle": true,
"cors": true,
"createHTMLDocument": true,
"focusinBubbles": false,
"noCloneChecked": true,
"optDisabled": true,
"optSelected": true,
"pixelPosition": false,
"radioValue": true,
"reliableMarginRight": true
};
} else if ( /8.0(\.\d+|) safari/i.test( userAgent ) ) {
expected = {
"ajax": true,
"boxSizingReliable": true,
"checkClone": true,
"checkOn": true,
"clearCloneStyle": true,
"cors": true,
"createHTMLDocument": false,
"focusinBubbles": false,
"noCloneChecked": true,
"optDisabled": true,
@@ -125,6 +146,7 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
"checkOn": true,
"clearCloneStyle": true,
"cors": true,
"createHTMLDocument": true,
"focusinBubbles": false,
"noCloneChecked": true,
"optDisabled": true,
@@ -141,6 +163,7 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
"checkOn": true,
"clearCloneStyle": true,
"cors": true,
"createHTMLDocument": true,
"focusinBubbles": false,
"noCloneChecked": true,
"optDisabled": true,
@@ -157,6 +180,7 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
"checkOn": false,
"clearCloneStyle": true,
"cors": true,
"createHTMLDocument": true,
"focusinBubbles": false,
"noCloneChecked": true,
"optDisabled": true,
@@ -173,6 +197,7 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
"checkOn": false,
"clearCloneStyle": false,
"cors": true,
"createHTMLDocument": true,
"focusinBubbles": false,
"noCloneChecked": true,
"optDisabled": false,

0 comments on commit cfe468f

Please sign in to comment.