From 560bb4754468c9a37d96b99694ae4f17c52c385a Mon Sep 17 00:00:00 2001 From: William Roe Date: Tue, 30 Oct 2012 15:53:42 +0000 Subject: [PATCH] Only try to extract webkitVersion if that matches. Firefox/Gecko on Android is a real thing --- bowser.js | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/bowser.js b/bowser.js index 951845d..7f4fc1b 100644 --- a/bowser.js +++ b/bowser.js @@ -74,20 +74,22 @@ } return o } - if (android) return { - webkit: t - , android: t - , mobile: t - , version: ua.match(webkitVersion)[1] - } - if (safari) return { - webkit: t - , safari: t - , version: ua.match(webkitVersion)[1] - } - if (opera) return { - opera: t - , version: ua.match(webkitVersion)[1] + if (webkitVersion.test(ua)) { + if (android) return { + webkit: t + , android: t + , mobile: t + , version: ua.match(webkitVersion)[1] + } + if (safari) return { + webkit: t + , safari: t + , version: ua.match(webkitVersion)[1] + } + if (opera) return { + opera: t + , version: ua.match(webkitVersion)[1] + } } if (gecko) { o = { @@ -96,6 +98,10 @@ , version: ua.match(/firefox\/(\d+(\.\d+)?)/i)[1] } if (firefox) o.firefox = t + if (android) { + o.android = t + o.mobile = t + } return o } if (seamonkey) return {