From a84480affb1d2714ebd4a03dd656a4bc516b8ceb Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Thu, 2 Oct 2014 12:22:43 -0700 Subject: [PATCH] refactor: use document.documentMode to determine msie version Closes #9398 --- src/Angular.js | 9 +++------ src/ngScenario/browserTrigger.js | 6 +++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Angular.js b/src/Angular.js index ae2831d2..2a7540eb 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -173,13 +173,10 @@ var /** holds major version number for IE or NaN for real browsers */ uid = 0; /** - * IE 11 changed the format of the UserAgent string. - * See http://msdn.microsoft.com/en-us/library/ms537503.aspx + * documentMode is an IE-only property + * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx */ -msie = int((/msie (\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]); -if (isNaN(msie)) { - msie = int((/trident\/.*; rv:(\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]); -} +msie = document.documentMode; /** diff --git a/src/ngScenario/browserTrigger.js b/src/ngScenario/browserTrigger.js index d1466dbb..ceaa30d5 100644 --- a/src/ngScenario/browserTrigger.js +++ b/src/ngScenario/browserTrigger.js @@ -1,7 +1,11 @@ 'use strict'; (function() { - var msie = parseInt((/msie (\d+)/.exec(navigator.userAgent.toLowerCase()) || [])[1], 10); + /** + * documentMode is an IE-only property + * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx + */ + msie = document.documentMode; /** * Triggers a browser event. Attempts to choose the right event if one is