Archives/lancedikson_bowser
1
0
Fork 0
mirror of https://github.com/lancedikson/bowser synced 2026-03-02 03:40:27 +00:00
Code Issues Releases Wiki Activity

removed falsy flags from results, added osversion for ios/android/winphone,

Browse Source 
added msie flag for winphone, made ios safari a-grade down to v6
This commit is contained in:
BendingBender
2014-02-21 13:56:57 +01:00
parent 0da898f906
commit ede3ff49cd
4 changed files with 129 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/bowser.js
View File

@@ -36,7 +36,6 @@
, blackberry = /blackberry/i.test(ua)
, webkitVersion = /version\/(\d+(\.\d+)?)/i
, firefoxVersion = /firefox[ \/](\d+(\.\d+)?)/i
, mobile = /mobile/i.test(ua)
, o = {}
if (ipod) iphone = false
@@ -44,6 +43,7 @@
if (windowsphone) o = {
name: 'Windows Phone'
, windowsphone: t
, msie: t
, mobile: t
, version: getVersion(ua, /iemobile\/(\d+(\.\d+)?)/i, 1)
}
@@ -69,18 +69,20 @@
, msie: t
, version: getVersion(ua, /(msie |rv:)(\d+(\.\d+)?)/i, 2)
}
else if (chrome) o = {
else if (chrome) {
o = {
name: 'Chrome'
, webkit: t
, chrome: t
, version: getVersion(ua, /(?:chrome|crios)\/(\d+(\.\d+)?)/i, 1)
, ipad: ipad
, iphone: iphone
, ipod: ipod
, ios: iphone || ipad || ipod
, android: android
, mobile: mobile
}
if (android) o.android = t
if (ipad || ipod || iphone) {
o[iphone ? 'iphone' : ipad ? 'ipad' : 'ipod'] = t
o.ios = t
}
if (o.android || o.ios) o.mobile = t
}
else if (phantom) o = {
name: 'PhantomJS'
, webkit: t
@@ -106,10 +108,8 @@
, webkit: t
, mobile: t
, ios: t
, iphone: iphone
, ipad: ipad
, ipod: ipod
}
o[iphone ? 'iphone' : ipad ? 'ipad' : 'ipod'] = t
// WTF: version is not part of user agent in web apps
if (webkitVersion.test(ua)) {
o.version = getVersion(ua, webkitVersion, 1)
@@ -172,13 +172,33 @@
, version: getVersion(ua, webkitVersion, 1)
}
var osVersion;
if (android) {
osVersion = getVersion(ua, /android[ \/](\d+(\.\d+)*)/i, 1);
if (osVersion) {
o.osversion = osVersion;
}
} else if (iphone || ipad || ipod) {
osVersion = getVersion(ua, /os (\d+([_\s]\d+)*) like mac os x/i, 1);
if (osVersion) {
o.osversion = osVersion.replace(/[_\s]/g, '.');
}
} else if (windowsphone) {
osVersion = getVersion(ua, /windows phone (?:os)?\s?(\d+(\.\d+)*)/i, 1);
if (osVersion) {
o.osversion = osVersion;
}
}
// Graded Browser Support
// http://developer.yahoo.com/yui/articles/gbs
if ((o.msie && o.version >= 9) ||
(o.chrome && o.version >= 20) ||
(o.firefox && o.version >= 10.0) ||
(o.safari && o.version >= 5) ||
(o.opera && o.version >= 10.0)) {
(o.opera && o.version >= 10.0) ||
(o.ios && o.osversion && o.osversion.split(".")[0] >= 6)
) {
o.a = t;
}
@@ -186,7 +206,9 @@
(o.chrome && o.version < 20) ||
(o.firefox && o.version < 10.0) ||
(o.safari && o.version < 5) ||
(o.opera && o.version < 10.0)) {
(o.opera && o.version < 10.0) ||
(o.ios && o.osversion && o.osversion.split(".")[0] < 6)
) {
o.c = t
} else o.x = t