diff options
| author |   Dererk <dererk@satellogic.com> | 2016-11-15 14:18:53 -0300 |
|---|---|---|
| committer | Dererk <dererk@satellogic.com> | 2016-11-15 14:18:53 -0300 |
| commit | 1ad5102b7ddd181bb9c632b124d3ea4c7db28be6 (patch) | |
| tree | 73dda18465d0f4b8eb52d4482282a387c9f67c95 /bower_components/jquery/src/ajax/parseXML.js | |
| parent | b67294f76809a681ff73f209ed691a3e3f00563d (diff) | |
| parent | ffb671c61a24a9086343b54bad080e145ff33fc5 (diff) | |
Merge tag 'upstream/7.8.1'
Upstream version 7.8.1
# gpg: Firmado el mar 15 nov 2016 14:18:48 ART
# gpg: usando RSA clave A6C7B88B9583046A11C5403E0B00FB6CEBE2D002
# gpg: Firma correcta de "Ulises Vitulli <dererk@debian.org>" [absoluta]
# gpg: alias "Dererk <dererk@torproject.org>" [absoluta]
# gpg: alias "Ulises Vitulli <uvitulli@fi.uba.ar>" [absoluta]
# gpg: alias "Ulises Vitulli <dererk@satellogic.com>" [absoluta]
Diffstat (limited to 'bower_components/jquery/src/ajax/parseXML.js')
| -rw-r--r-- | bower_components/jquery/src/ajax/parseXML.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bower_components/jquery/src/ajax/parseXML.js b/bower_components/jquery/src/ajax/parseXML.js index 0b92c7a..a05e800 100644 --- a/bower_components/jquery/src/ajax/parseXML.js +++ b/bower_components/jquery/src/ajax/parseXML.js @@ -1,4 +1,4 @@ -define([ +define( [ "../core" ], function( jQuery ) { @@ -10,14 +10,14 @@ jQuery.parseXML = function( data ) { } try { if ( window.DOMParser ) { // Standard - tmp = new DOMParser(); + tmp = new window.DOMParser(); xml = tmp.parseFromString( data, "text/xml" ); } else { // IE - xml = new ActiveXObject( "Microsoft.XMLDOM" ); + xml = new window.ActiveXObject( "Microsoft.XMLDOM" ); xml.async = "false"; xml.loadXML( data ); } - } catch( e ) { + } catch ( e ) { xml = undefined; } if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) { @@ -28,4 +28,4 @@ jQuery.parseXML = function( data ) { return jQuery.parseXML; -}); +} ); |