From 1c8e8155931124a40a1c8d8c3acb189a36898754 Mon Sep 17 00:00:00 2001 From: Mark Veenstra Date: Thu, 2 Jan 2020 10:35:06 +0100 Subject: [PATCH 1/2] #113 (browser) - Properly detect new Edge Chromium version as Edge instead of Chrome --- src/browser/DeviceProxy.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/browser/DeviceProxy.js b/src/browser/DeviceProxy.js index 4dc80ec0..0f30c608 100644 --- a/src/browser/DeviceProxy.js +++ b/src/browser/DeviceProxy.js @@ -37,8 +37,16 @@ function getBrowserInfo (getModel) { var returnVal = ''; var offset; - if ((offset = userAgent.indexOf('Edge')) !== -1) { - returnVal = (getModel) ? 'Edge' : userAgent.substring(offset + 5); + if ((offset = userAgent.indexOf('Edg')) !== -1) { + if (getModel) { + returnVal = 'Edge'; + } else { + if ((offset = userAgent.indexOf('Edge')) !== -1) { + returnVal = userAgent.substring(offset + 5); + } else { + returnVal = userAgent.substring(offset + 4); + } + } } else if ((offset = userAgent.indexOf('Chrome')) !== -1) { returnVal = (getModel) ? 'Chrome' : userAgent.substring(offset + 7); } else if ((offset = userAgent.indexOf('Safari')) !== -1) { From 839005a9643c5410956d48f616cf9faac6de484c Mon Sep 17 00:00:00 2001 From: Alko Schuster Date: Tue, 7 Jul 2020 09:40:29 +0200 Subject: [PATCH 2/2] Remove wrongful offset assignment --- src/browser/DeviceProxy.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/browser/DeviceProxy.js b/src/browser/DeviceProxy.js index f7a5e27a..d57403fa 100644 --- a/src/browser/DeviceProxy.js +++ b/src/browser/DeviceProxy.js @@ -41,10 +41,9 @@ function getBrowserInfo (getModel) { if (getModel) { returnVal = 'Edge'; } else { + returnVal = userAgent.substring(offset + 4); if ((offset = userAgent.indexOf('Edge')) !== -1) { returnVal = userAgent.substring(offset + 5); - } else { - returnVal = userAgent.substring(offset + 4); } } } else if ((offset = userAgent.indexOf('Chrome')) !== -1) {