diff options
| author | Dave Methvin <dave.methvin@gmail.com> | 2013-12-15 22:02:51 -0500 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2013-12-15 22:02:51 -0500 |
| commit | b278d8174f307fd351ae9ce6409c1806e7426e34 (patch) | |
| tree | c9f046190a29a4d24355d3a39d9de63ecc1ec717 | |
| parent | f9ad13c9ec8967916427642db2883a1bf3bccd86 (diff) | |
| download | jquery-b278d8174f307fd351ae9ce6409c1806e7426e34.tar.gz jquery-b278d8174f307fd351ae9ce6409c1806e7426e34.zip | |
Revert "Ajax: Fix #14424. Use ActiveX in IE9+ on local files, close gh-1434."
This reverts commit 498e0e6c9bf486a0b1f16b455d65fcbc6c43867e.
We can't use the ActiveX XHR because it doesn't support events.
| -rw-r--r-- | src/.jshintrc | 3 | ||||
| -rw-r--r-- | src/ajax/xhr.js | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/.jshintrc b/src/.jshintrc index a601fa051..ba16cd5db 100644 --- a/src/.jshintrc +++ b/src/.jshintrc @@ -20,7 +20,6 @@ "globals": { "jQuery": true, "define": true, - "module": true, - "ActiveXObject": true + "module": true } } diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js index 313dff5dc..55d526a41 100644 --- a/src/ajax/xhr.js +++ b/src/ajax/xhr.js @@ -5,14 +5,6 @@ define([ ], function( jQuery, support ) { jQuery.ajaxSettings.xhr = function() { - // Support: IE9+ - // IE can't get local files with standard XHR, only ActiveX - if ( this.isLocal ) { - try { - return new ActiveXObject( "Microsoft.XMLHTTP" ); - } catch( e ) {} - } - try { return new XMLHttpRequest(); } catch( e ) {} |