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

151
src/useragents.js
View File

@@ -9,11 +9,8 @@ module.exports.useragents = {
Chrome: {
'Mozilla/5.0 (Linux; Android 4.3; Galaxy Nexus Build/JWR66Y) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.99 Mobile Safari/537.36': {
chrome: true
, ipad: false
, iphone: false
, ipod: false
, ios: false
, android: true
, osversion: '4.3'
, mobile: true
, version: '32.0'
, webkit: true
@@ -21,11 +18,8 @@ module.exports.useragents = {
}
, 'Mozilla/5.0 (Linux; Android 4.1; Galaxy Nexus Build/JRN84D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19': {
chrome: true
, ipad: false
, iphone: false
, ipod: false
, ios: false
, android: true
, osversion: '4.1'
, mobile: true
, version: '18.0'
, webkit: true
@@ -33,11 +27,9 @@ module.exports.useragents = {
}
, 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3': {
chrome: true
, ipad: false
, iphone: true
, ipod: false
, ios: true
, android: false
, osversion: '5.1.1'
, mobile: true
, version: '19.0'
, webkit: true
@@ -46,10 +38,8 @@ module.exports.useragents = {
, 'Mozilla/5.0 (iPad; U; CPU OS 5_1_1 like Mac OS X; en-us) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3': {
chrome: true
, ipad: true
, iphone: false
, ipod: false
, ios: true
, android: false
, osversion: '5.1.1'
, mobile: true
, version: '19.0'
, webkit: true
@@ -57,84 +47,42 @@ module.exports.useragents = {
}
, 'Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.17 Safari/537.36': {
chrome: true
, ipad: false
, iphone: false
, ipod: false
, ios: false
, android: false
, mobile: false
, version: '30.0'
, webkit: true
, a: true
}
, 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.62 Safari/537.36': {
chrome: true
, ipad: false
, iphone: false
, ipod: false
, ios: false
, android: false
, mobile: false
, version: '29.0'
, webkit: true
, a: true
}
, 'Mozilla/5.0 (X11; CrOS i686 4319.74.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.57 Safari/537.36': {
chrome: true
, ipad: false
, iphone: false
, ipod: false
, ios: false
, android: false
, mobile: false
, version: '29.0'
, webkit: true
, a: true
}
, 'Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.2 Safari/537.36': {
chrome: true
, ipad: false
, iphone: false
, ipod: false
, ios: false
, android: false
, mobile: false
, version: '29.0'
, webkit: true
, a: true
}
, 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1468.0 Safari/537.36': {
chrome: true
, ipad: false
, iphone: false
, ipod: false
, ios: false
, android: false
, mobile: false
, version: '28.0'
, webkit: true
, a: true
}
, 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.57 Safari/534.24': {
chrome: true
, ipad: false
, iphone: false
, ipod: false
, ios: false
, android: false
, mobile: false
, version: '11.0'
, webkit: true
, c: true
}
, 'Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.3 (KHTML, like Gecko) Chrome/6.0.462.0 Safari/534.3': {
chrome: true
, ipad: false
, iphone: false
, ipod: false
, ios: false
, android: false
, mobile: false
, version: '6.0'
, webkit: true
, c: true
@@ -155,6 +103,7 @@ module.exports.useragents = {
opera: true
, webkit: true
, android: true
, osversion: '4.3'
, mobile: true
, version: '19.0'
, a: true
@@ -169,6 +118,7 @@ module.exports.useragents = {
opera: true
, version: '12.10'
, android: true
, osversion: '4.3'
, mobile: true
, a: true
}
@@ -273,7 +223,12 @@ module.exports.useragents = {
}
}
, 'Internet Explorer': {
'Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; .NET4.0E; .NET4.0C; Media Center PC 6.0; rv:11.0) like Gecko': {
'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Trident/6.0; ARM; Touch; WPDesktop)': {
msie: true
, version: '10.0'
, a: true
}
, 'Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; .NET4.0E; .NET4.0C; Media Center PC 6.0; rv:11.0) like Gecko': {
msie: true
, version: '11.0'
, a: true
@@ -467,42 +422,44 @@ module.exports.useragents = {
}
}
, iPhone: {
'Mozilla/5.0 (iPhone Simulator; U; CPU iPhone OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5': {
'Mozilla/5.0 (iPhone; CPU iPhone OS 7_0_4 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Mobile/11B554a': {
ios: true
, version: '5.0'
, osversion: '7.0.4'
, iphone: true
, ipad: false
, ipod: false
, mobile: true
, webkit: true
, x: true
, a: true
}
, 'Mozilla/5.0 (iPhone Simulator; U; CPU iPhone OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5': {
ios: true
, osversion: '4.3.2'
, version: '5.0'
, iphone: true
, mobile: true
, webkit: true
, c: true
}
, 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3': {
ios: true
, version: '3.0'
, iphone: true
, ipad: false
, ipod: false
, mobile: true
, webkit: true
, x: true
}
, 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B5097d Safari/6531.22.7': {
ios: true
, osversion: '4.1'
, version: '4.0'
, iphone: true
, ipad: false
, ipod: false
, mobile: true
, webkit: true
, x: true
, c: true
}
, 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_5_2; en-gb) AppleWebKit/526+ (KHTML, like Gecko) Version/3.1 iPhone': {
ios: true
, version: '3.1'
, iphone: true
, ipad: false
, ipod: false
, mobile: true
, webkit: true
, x: true
@@ -511,75 +468,67 @@ module.exports.useragents = {
, iPad: {
'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25': {
ios: true
, osversion: '6.0'
, name: 'iPad'
, version: '6.0'
, iphone: false
, ipad: true
, ipod: false
, mobile: true
, webkit: true
, x: true
, a: true
}
, 'Mozilla/5.0 (iPad; CPU OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko ) Version/5.1 Mobile/9B176 Safari/7534.48.3': {
ios: true
, osversion: '5.1'
, name: 'iPad'
, version: '5.1'
, iphone: false
, ipad: true
, ipod: false
, mobile: true
, webkit: true
, x: true
, c: true
}
, 'Mozilla/5.0 (iPad; U; CPU OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5': {
ios: true
, osversion: '4.3.2'
, name: 'iPad'
, version: '5.0'
, iphone: false
, ipad: true
, ipod: false
, mobile: true
, webkit: true
, x: true
, c: true
}
, 'Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; es-es) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B360 Safari/531.21.10': {
ios: true
, osversion: '3.2'
, name: 'iPad'
, version: '4.0'
, iphone: false
, ipad: true
, ipod: false
, mobile: true
, webkit: true
, x: true
, c: true
}
}
, iPod: {
'Mozilla/5.0 (iPod; CPU iPhone OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B176 Safari/7534.48.3': {
ios: true
, osversion: '5.1'
, version: '5.1'
, iphone: false
, ipad: false
, ipod: true
, mobile: true
, webkit: true
, x: true
, c: true
}
, 'Mozilla/5.0 (iPod; U; CPU iPhone OS 4_3_3 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5': {
ios: true
, osversion: '4.3.3'
, version: '5.0'
, iphone: false
, ipad: false
, ipod: true
, mobile: true
, webkit: true
, x: true
, c: true
}
, 'Mozilla/5.0 (iPod; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/4A93 Safari/419.3': {
ios: true
, version: '3.0'
, iphone: false
, ipad: false
, ipod: true
, mobile: true
, webkit: true
@@ -615,23 +564,37 @@ module.exports.useragents = {
}
}
, 'Windows Phone': {
'Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 920)': {
'Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 920; Vodafone)': {
windowsphone: true
, osversion: '8.0'
, msie: true
, version: '10.0'
, mobile: true
, x: true
, a: true
}
, 'Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 920)': {
windowsphone: true
, osversion: '8.0'
, msie: true
, version: '10.0'
, mobile: true
, a: true
}
, 'Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0)': {
windowsphone: true
, osversion: '7.5'
, msie: true
, version: '9.0'
, mobile: true
, x: true
, a: true
}
, 'Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; Nokia;N70)': {
windowsphone: true
, osversion: '7.0'
, msie: true
, version: '7.0'
, mobile: true
, x: true
, c: true
}
}
, WebOS: {
@@ -646,6 +609,7 @@ module.exports.useragents = {
, Android: {
'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; T-Mobile G2 Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1': {
android: true
, osversion: '2.3.4'
, webkit: true
, version: 4.0
, mobile: true
@@ -653,6 +617,7 @@ module.exports.useragents = {
}
, 'Mozilla/5.0 (Linux; U; Android 1.6; ar-us; SonyEricssonX10i Build/R2BA026) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1': {
android: true
, osversion: '1.6'
, webkit: true
, version: 3.1
, mobile: true