[Pkg-javascript-commits] [dojo] 82/149: add edge sniffing + make sure edge does not report it is chrome fixes #18172

[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 ac05a45b05d2c6b58770a67cbad0e691790d56a2
Author: Christophe Jolif <cjolif at gmail.com>
Date:   Sat Sep 26 14:28:47 2015 +0200

    add edge sniffing + make sure edge does not report it is chrome
    fixes #18172
---
 sniff.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sniff.js b/sniff.js
index 500d54a..374acaf 100644
--- a/sniff.js
+++ b/sniff.js
@@ -21,12 +21,14 @@ define(["./has"], function(has){
 		has.add("khtml", dav.indexOf("Konqueror") >= 0 ? tv : undefined);
 		has.add("webkit", !has("wp") // NOTE: necessary since Windows Phone 8.1 Update 1, see #18540
 				&& parseFloat(dua.split("WebKit/")[1]) || undefined);
-		has.add("chrome", parseFloat(dua.split("Chrome/")[1]) || undefined);
+		has.add("edge", parseFloat(dua.split("Edge/")[1]) || undefined);
+		has.add("chrome", !has("edge")
+				&& parseFloat(dua.split("Chrome/")[1]) || undefined);
 		has.add("android", !has("wp") // NOTE: necessary since Windows Phone 8.1 Update 1, see #18528
 				&& parseFloat(dua.split("Android ")[1]) || undefined);
 		has.add("safari", dav.indexOf("Safari") >= 0 
 				&& !has("wp") // NOTE: necessary since Windows Phone 8.1 Update 1, see #18540
-				&& !has("chrome") && !has("android") ?
+				&& !has("chrome") && !has("android") && !has("edge") ?
 			parseFloat(dav.split("Version/")[1]) : undefined);
 		has.add("mac", dav.indexOf("Macintosh") >= 0);
 		has.add("quirks", document.compatMode == "BackCompat");

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