From d6fb6d53589720f2c1282507cbf81a64f31cd0b9 Mon Sep 17 00:00:00 2001 From: Denis Demchenko Date: Sun, 8 May 2016 15:08:19 +0300 Subject: [PATCH] fix order: Chrome should be almost lowest, but before Safari --- src/bowser.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/bowser.js b/src/bowser.js index 37a0cd8..b2bbe8c 100644 --- a/src/bowser.js +++ b/src/bowser.js @@ -117,18 +117,11 @@ , version: edgeVersion } } - else if (/vivaldi/i.test(ua)) { - result = { - name: 'Vivaldi' - , vivaldi: t - , version: getFirstMatch(/vivaldi\/(\d+(\.\d+)?)/i) || versionIdentifier - } - } - else if (/chrome|crios|crmo/i.test(ua)) { + else if (/vivaldi/i.test(ua)) { result = { - name: 'Chrome' - , chrome: t - , version: getFirstMatch(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i) + name: 'Vivaldi' + , vivaldi: t + , version: getFirstMatch(/vivaldi\/(\d+(\.\d+)?)/i) || versionIdentifier } } else if (sailfish) { @@ -162,12 +155,6 @@ , version : getFirstMatch(/silk\/(\d+(\.\d+)?)/i) } } - else if (android) { - result = { - name: 'Android' - , version: versionIdentifier - } - } else if (/phantom/i.test(ua)) { result = { name: 'PhantomJS' @@ -211,6 +198,19 @@ , version: getFirstMatch(/(?:qupzilla)[\s\/](\d+(?:\.\d+)+)/i) || versionIdentifier } } + else if (/chrome|crios|crmo/i.test(ua)) { + result = { + name: 'Chrome' + , chrome: t + , version: getFirstMatch(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i) + } + } + else if (android) { + result = { + name: 'Android' + , version: versionIdentifier + } + } else if (/safari|applewebkit/i.test(ua)) { result = { name: 'Safari'