[Pkg-javascript-commits] [dojo] 10/28: Revert "Fix IE11 sniffing. Fixes #17311."

[David Prévot]

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

taffit pushed a commit to annotated tag 1.8.6
in repository dojo.

commit 772563ca6cedfd1126def94ca3f7b35849e38a23
Author: Colin Snover <github.com at zetafleet.com>
Date:   Tue Nov 26 22:58:30 2013 +0000

    Revert "Fix IE11 sniffing. Fixes #17311."
    
    This reverts commit f58c0e19ce509398985908688a768c8fb41191b8.
    
    (cherry picked from commit 477d62923e7cd1e32799395301f21c008dc55de6)
    (cherry picked from commit 788afa04681010da261850e81f847089826c7dba)
---
 sniff.js  | 29 ++++++++++++-----------------
 window.js |  2 +-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/sniff.js b/sniff.js
index d0787f0..96bdb37 100644
--- a/sniff.js
+++ b/sniff.js
@@ -34,15 +34,19 @@ define(["./has"], function(has){
 				has.add("opera", tv >= 9.8 ? parseFloat(dua.split("Version/")[1]) || tv : tv);
 			}
 
-			var isIE = 0;
-			if(document.all && !has("opera")){
-				// IE < 11
-				isIE = parseFloat(dav.split("MSIE ")[1]) || undefined;
-			}else if(dav.indexOf("Trident")){
-				// IE >= 9
-				isIE = parseFloat(dav.split("rv:")[1]) || undefined;
+			// Mozilla and firefox
+			if(dua.indexOf("Gecko") >= 0 && !has("khtml") && !has("webkit")){
+				has.add("mozilla", tv);
 			}
-			if(isIE){
+			if(has("mozilla")){
+				//We really need to get away from this. Consider a sane isGecko approach for the future.
+				has.add("ff", parseFloat(dua.split("Firefox/")[1] || dua.split("Minefield/")[1]) || undefined);
+			}
+
+			// IE
+			if(document.all && !has("opera")){
+				var isIE = parseFloat(dav.split("MSIE ")[1]) || undefined;
+
 				//In cases where the page has an HTTP header or META tag with
 				//X-UA-Compatible, then it is in emulation mode.
 				//Make sure isIE reflects the desired version.
@@ -56,15 +60,6 @@ define(["./has"], function(has){
 
 				has.add("ie", isIE);
 			}
-			
-			// Mozilla and firefox
-			if(!has("ie") && dua.indexOf("Gecko") >= 0 && !has("khtml") && !has("webkit")){
-				has.add("mozilla", tv);
-			}
-			if(has("mozilla")){
-				//We really need to get away from this. Consider a sane isGecko approach for the future.
-				has.add("ff", parseFloat(dua.split("Firefox/")[1] || dua.split("Minefield/")[1]) || undefined);
-			}
 
 			// Wii
 			has.add("wii", typeof opera != "undefined" && opera.wiiremote);
diff --git a/window.js b/window.js
index c02cc3c..c9d24b2 100644
--- a/window.js
+++ b/window.js
@@ -100,7 +100,7 @@ define(["./_base/lang", "./sniff", "./_base/window", "./dom", "./dom-geometry",
 			// reference to the real window object (maybe a copy), so we must fix it as well
 			// We use IE specific execScript to attach the real window reference to
 			// document._parentWindow for later use
-			if(has("ie") < 9 && window !== document.parentWindow){
+			if(has("ie") && window !== document.parentWindow){
 				/*
 				In IE 6, only the variable "window" can be used to connect events (others
 				may be only copies).

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