[Pkg-javascript-commits] [dojo] 104/149: fixes #17020, fix detection for activex and file protocol for request/xhr

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository dojo.

commit e13a7758ec051db56150886e03ef9ba9b655a0ed
Author: dylans <dylan at dojotoolkit.org>
Date:   Tue Dec 22 12:49:16 2015 -0700

    fixes #17020, fix detection for activex and file protocol for request/xhr
---
 request/xhr.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/request/xhr.js b/request/xhr.js
index 48e134f..d857d76 100644
--- a/request/xhr.js
+++ b/request/xhr.js
@@ -12,11 +12,11 @@ define([
 		return typeof XMLHttpRequest !== 'undefined';
 	});
 	has.add('dojo-force-activex-xhr', function(){
-		return has('activex') && !document.addEventListener && window.location.protocol === 'file:';
+		return has('activex') && window.location.protocol === 'file:';
 	});
 
 	has.add('native-xhr2', function(){
-		if(!has('native-xhr')){ return; }
+		if(!has('native-xhr') || has('dojo-force-activex-xhr')){ return; }
 		var x = new XMLHttpRequest();
 		return typeof x['addEventListener'] !== 'undefined' &&
 			(typeof opera === 'undefined' || typeof x['upload'] !== 'undefined');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git