diff options
| author | Richard Gibson <richard.gibson@gmail.com> | 2013-11-04 23:36:15 -0500 |
|---|---|---|
| committer | Richard Gibson <richard.gibson@gmail.com> | 2013-11-12 00:13:08 -0500 |
| commit | 71b2ac524e49c0d1cc4e5d7bd8fd9d5a1317a20b (patch) | |
| tree | d2f8a47f86968e84efdbe3b88fcbcf61a8c516f4 /test/jquery.js | |
| parent | e8e53a6bb579938e0280724b7e84260589918cf2 (diff) | |
| download | jquery-71b2ac524e49c0d1cc4e5d7bd8fd9d5a1317a20b.tar.gz jquery-71b2ac524e49c0d1cc4e5d7bd8fd9d5a1317a20b.zip | |
Fix #14492: More correct jQuery.parseJSON. Close gh-1419.
(cherry picked from commit 60a6178131afec97b68c9a45bc24459f7b8bd905)
Conflicts:
src/ajax/parseJSON.js
Diffstat (limited to 'test/jquery.js')
| -rw-r--r-- | test/jquery.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/jquery.js b/test/jquery.js index bdee83c28..e94f55fe8 100644 --- a/test/jquery.js +++ b/test/jquery.js @@ -11,12 +11,13 @@ QUnit.config.urlConfig.push({ id: "basic", label: "Bypass optimizations", - tooltip: "Force use of the most basic code by disabling native querySelectorAll; contains; compareDocumentPosition" + tooltip: "Force use of the most basic code by disabling native querySelectorAll; contains; compareDocumentPosition; JSON.parse" }); if ( QUnit.urlParams.basic ) { document.querySelectorAll = null; document.documentElement.contains = null; document.documentElement.compareDocumentPosition = null; + window.JSON = null; } // iFrames won't load AMD (the iframe tests synchronously expect jQuery to be there) |