From d525ae3416417186330bb3d14133df84509803a0 Mon Sep 17 00:00:00 2001 From: Michał Gołębiowski-Owczarek Date: Mon, 27 Jan 2020 18:54:47 +0100 Subject: Build:Tests: Fix custom build tests, verify on Travis; name Travis jobs 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 4.0 (#4553) slim build: `custom:-ajax,-callbacks,-deferred,-effects` It also adds separate Travis jobs for the no-deprecated & slim builds. Apart from that, add intuitive names to Travis jobs. Otherwise it's hard to see at a glance that a particular job is running on Firefox ESR, for example. Ref gh-4577 Ref gh-4596 Closes gh-4600 --- src/ajax.js | 2 +- src/ajax/parseXML.js | 30 ------------------------------ src/core/parseXML.js | 30 ++++++++++++++++++++++++++++++ src/jquery.js | 2 ++ 4 files changed, 33 insertions(+), 31 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 b1f160840..11eda0da0 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -8,7 +8,7 @@ define( [ "./ajax/var/rquery", "./core/init", - "./ajax/parseXML", + "./core/parseXML", "./event/trigger", "./deferred", "./serialize" // jQuery.param diff --git a/src/ajax/parseXML.js b/src/ajax/parseXML.js deleted file mode 100644 index acf7ab259..000000000 --- a/src/ajax/parseXML.js +++ /dev/null @@ -1,30 +0,0 @@ -define( [ - "../core" -], function( jQuery ) { - -"use strict"; - -// Cross-browser xml parsing -jQuery.parseXML = function( data ) { - var xml; - if ( !data || typeof data !== "string" ) { - return null; - } - - // Support: IE 9 - 11 only - // 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; -}; - -return jQuery.parseXML; - -} ); diff --git a/src/core/parseXML.js b/src/core/parseXML.js new file mode 100644 index 000000000..acf7ab259 --- /dev/null +++ b/src/core/parseXML.js @@ -0,0 +1,30 @@ +define( [ + "../core" +], function( jQuery ) { + +"use strict"; + +// Cross-browser xml parsing +jQuery.parseXML = function( data ) { + var xml; + if ( !data || typeof data !== "string" ) { + return null; + } + + // Support: IE 9 - 11 only + // 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; +}; + +return jQuery.parseXML; + +} ); diff --git a/src/jquery.js b/src/jquery.js index 61c4b2f0d..0c144c194 100644 --- a/src/jquery.js +++ b/src/jquery.js @@ -23,6 +23,8 @@ define( [ "./ajax/script", "./ajax/jsonp", "./ajax/load", + "./core/parseXML", + "./core/parseHTML", "./effects", "./effects/animatedSelector", "./offset", -- cgit v1.2.3