From a117862e3f11327426f4722c314a88b1a4cb7df6 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 26 Nov 2015 01:52:47 -0500 Subject: [PATCH] Detect Edge useragent --- js/id/id.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/js/id/id.js b/js/id/id.js index b04565e5a..401a2e3ee 100644 --- a/js/id/id.js +++ b/js/id/id.js @@ -341,10 +341,17 @@ iD.version = '1.8.0'; var ua = navigator.userAgent, m = null; - m = ua.match(/Trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/i); // IE11+ + m = ua.match(/(edge)\/?\s*(\.?\d+(\.\d+)*)/i); // Edge if (m !== null) { - detected.browser = 'msie'; - detected.version = m[1]; + detected.browser = m[1]; + detected.version = m[2]; + } + if (!detected.browser) { + m = ua.match(/Trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/i); // IE11 + if (m !== null) { + detected.browser = 'msie'; + detected.version = m[1]; + } } if (!detected.browser) { m = ua.match(/(opr)\/?\s*(\.?\d+(\.\d+)*)/i); // Opera 15+ @@ -373,9 +380,9 @@ iD.version = '1.8.0'; if (detected.browser.toLowerCase() === 'msie') { detected.ie = true; detected.browser = 'Internet Explorer'; - detected.support = parseFloat(detected.version) > 9; + detected.support = parseFloat(detected.version) >= 11; } else { - detected.ie = false + detected.ie = false; detected.support = true; }