From 0f780ba7cc5968d53bba386bdcb59b8d9410873b Mon Sep 17 00:00:00 2001 From: Michał Gołębiowski-Owczarek Date: Tue, 7 Jan 2020 23:59:08 +0100 Subject: Build:Tests: Fix custom build tests, verify on Travis This commit fixes unit tests for the following builds: 1. The no-deprecated build: `custom:-deprecated` 2. The current slim build: `custom:-ajax,-effects` 3. The future (#4553) slim build: `custom:-ajax,-callbacks,-deferred,-effects` It also adds separate Travis jobs for the no-deprecated & slim builds. Closes gh-4577 --- src/ajax.js | 2 +- src/ajax/parseXML.js | 24 ------------------------ src/core/parseXML.js | 24 ++++++++++++++++++++++++ src/jquery.js | 3 ++- 4 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 src/ajax/parseXML.js create mode 100644 src/core/parseXML.js (limited to 'src') diff --git a/src/ajax.js b/src/ajax.js index 3d4ce017b..44ec6e83b 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -6,7 +6,7 @@ import nonce from "./ajax/var/nonce.js"; import rquery from "./ajax/var/rquery.js"; import "./core/init.js"; -import "./ajax/parseXML.js"; +import "./core/parseXML.js"; import "./event/trigger.js"; import "./deferred.js"; import "./serialize.js"; // jQuery.param diff --git a/src/ajax/parseXML.js b/src/ajax/parseXML.js deleted file mode 100644 index d547eab53..000000000 --- a/src/ajax/parseXML.js +++ /dev/null @@ -1,24 +0,0 @@ -import jQuery from "../core.js"; - -// Cross-browser xml parsing -jQuery.parseXML = function( data ) { - var xml; - if ( !data || typeof data !== "string" ) { - return null; - } - - // Support: IE 9 - 11+ - // IE throws on parseFromString with invalid input. - try { - xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" ); - } catch ( e ) { - xml = undefined; - } - - if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) { - jQuery.error( "Invalid XML: " + data ); - } - return xml; -}; - -export default jQuery.parseXML; diff --git a/src/core/parseXML.js b/src/core/parseXML.js new file mode 100644 index 000000000..d547eab53 --- /dev/null +++ b/src/core/parseXML.js @@ -0,0 +1,24 @@ +import jQuery from "../core.js"; + +// Cross-browser xml parsing +jQuery.parseXML = function( data ) { + var xml; + if ( !data || typeof data !== "string" ) { + return null; + } + + // Support: IE 9 - 11+ + // IE throws on parseFromString with invalid input. + try { + xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" ); + } catch ( e ) { + xml = undefined; + } + + if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) { + jQuery.error( "Invalid XML: " + data ); + } + return xml; +}; + +export default jQuery.parseXML; diff --git a/src/jquery.js b/src/jquery.js index 24e58a93c..53515267b 100644 --- a/src/jquery.js +++ b/src/jquery.js @@ -21,8 +21,9 @@ import "./ajax.js"; import "./ajax/xhr.js"; import "./ajax/script.js"; import "./ajax/jsonp.js"; -import "./core/parseHTML.js"; import "./ajax/load.js"; +import "./core/parseXML.js"; +import "./core/parseHTML.js"; import "./event/ajax.js"; import "./effects.js"; import "./effects/animatedSelector.js"; -- cgit v1.2.3