diff options
author | Timmy Willison <timmywillisn@gmail.com> | 2014-12-09 18:00:06 -0500 |
---|---|---|
committer | Timmy Willison <timmywillisn@gmail.com> | 2014-12-09 18:01:33 -0500 |
commit | b77983173e18724a883e02ad3a84661e18e6cf4a (patch) | |
tree | fff3d29da27180d69425c57cee725251e0dcce16 | |
parent | 4ab743188ec6bdaafe8550dab84f374ef7e22aca (diff) | |
download | jquery-b77983173e18724a883e02ad3a84661e18e6cf4a.tar.gz jquery-b77983173e18724a883e02ad3a84661e18e6cf4a.zip |
Core: revert addition of createHTMLDocument. Thanks, Safari 8.
- Safari 8 has issues when the HTML string contains forms.
Closing tags are not respected.
-rw-r--r-- | src/core/parseHTML.js | 4 | ||||
-rw-r--r-- | test/unit/core.js | 14 |
2 files changed, 1 insertions, 17 deletions
diff --git a/src/core/parseHTML.js b/src/core/parseHTML.js index c501cdfc9..e0348971d 100644 --- a/src/core/parseHTML.js +++ b/src/core/parseHTML.js @@ -17,9 +17,7 @@ jQuery.parseHTML = function( data, context, keepScripts ) { keepScripts = context; context = false; } - // document.implementation stops scripts or inline event handlers from - // being executed immediately - context = context || document.implementation.createHTMLDocument( "" ); + context = context || document; var parsed = rsingleTag.exec( data ), scripts = !keepScripts && []; diff --git a/test/unit/core.js b/test/unit/core.js index c4c5ffa1a..17006a8ab 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -1370,20 +1370,6 @@ test("jQuery.parseHTML", function() { ok( jQuery.parseHTML("<#if><tr><p>This is a test.</p></tr><#/if>") || true, "Garbage input should not cause error" ); }); -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 ); |