diff --git a/bowser.js b/bowser.js index 252c5b0..86ac84e 100644 --- a/bowser.js +++ b/bowser.js @@ -90,12 +90,12 @@ if (uaTest(/windows phone/i)) { o.windowsphone = o[STR_MOBILE] = TRUE; o[STR_VERSION] = versionTest('iemobile\/'); + } else if (uaTest(/opera/i) || uaTest(/opr/i)) { + o[STR_OPERA] = TRUE; + o[STR_VERSION] = webkitVersion || versionTest('opr\/') || versionTest('opera[ \/]'); } else if (uaTest(/(msie|trident)/i)) { o[STR_MSIE] = TRUE; o[STR_VERSION] = versionTest('(msie |rv:)', 2); - } else if (uaTest(/opera/i) || uaTest(/opr/i)) { - o[STR_OPERA] = TRUE; - o[STR_VERSION] = webkitVersion || versionTest('opr\/'); } else if (uaTest(/chrome/i)) { o[STR_CHROME] = o[STR_WEBKIT] = TRUE; o[STR_VERSION] = versionTest(STR_CHROME + '\/'); diff --git a/bowser.min.js b/bowser.min.js index 24a6344..ebd2e8a 100644 --- a/bowser.min.js +++ b/bowser.min.js @@ -3,4 +3,4 @@ * https://github.com/ded/bowser * MIT License | (c) Dustin Diaz 2013 */ -!function(e,t){typeof define=="function"?define(t):typeof module!="undefined"&&module.exports?module.exports[e]=t():this[e]=t()}("bowser",function(){function f(f){function l(e){return e.test(f)}function c(e,t){var n=f.match(new RegExp(e+"(\\d+(\\.\\d+)?)","i"));return n?n[t||1]:0}var h=l(/iphone/i),p=l(/ipad/i),d=l(/ipod/i),v=c(t+"/"),m=c(a+"[/ ]"),g={},y=0;return l(/windows phone/i)?(g.windowsphone=g[n]=e,g[t]=c("iemobile/")):l(/(msie|trident)/i)?(g[r]=e,g[t]=c("(msie |rv:)",2)):l(/opera/i)||l(/opr/i)?(g[i]=e,g[t]=v||c("opr/")):l(/chrome/i)?(g[s]=g[o]=e,g[t]=c(s+"/")):l(/phantom/i)?(g.phantom=g[o]=e,g[t]=c("phantomjs/")):l(/touchpad/i)?(g.touchpad=g[o]=e,g[t]=c("touchpad/")):h||p||d?(g.ios=g[n]=g[o]=e,g[t]=v,d?g.ipod=e:h?g.iphone=e:p&&(g.ipad=e)):l(/blackberry/i)?(g.blackberry=g[n]=e,v?(g[o]=e,g[t]=v):g[t]=c("blackberry[\\d]+/")):l(/webos/i)?(g.webos=g[n]=g[o]=e,g[t]=v||c("wosbrowser/")):l(/android/i)?(g.android=g[n]=g[o]=e,g[t]=v||m):l(/safari/i)?(g[u]=g[o]=e,g[t]=v):l(/gecko\//i)?(g.gecko=g.mozilla=e,g[t]=m,l(/firefox/i)&&(g.firefox=e)):l(/seamonkey\//i)?(g.seamonkey=e,g[t]=c("seamonkey/")):g[t]=0,y=g[t],g[r]&&y>=8||g[s]&&y>=10||g[a]&&y>=4||g[u]&&y>=5||g[i]&&y>=10?g.a=e:g[r]&&y<8||g[s]&&y<10||g[a]&&y<4||g[u]&&y<5||g[i]&&y<10?g.c=e:g.x=e,g}var e=!0,t="version",n="mobile",r="msie",i="opera",s="chrome",o="webkit",u="safari",a="firefox",l=f(typeof navigator!="undefined"?navigator.userAgent:"");return l._detect=f,l}) \ No newline at end of file +!function(e,t){typeof define=="function"?define(t):typeof module!="undefined"&&module.exports?module.exports[e]=t():this[e]=t()}("bowser",function(){function f(f){function l(e){return e.test(f)}function c(e,t){var n=f.match(new RegExp(e+"(\\d+(\\.\\d+)?)","i"));return n?n[t||1]:0}var h=l(/iphone/i),p=l(/ipad/i),d=l(/ipod/i),v=c(t+"/"),m=c(a+"[/ ]"),g={},y=0;return l(/windows phone/i)?(g.windowsphone=g[n]=e,g[t]=c("iemobile/")):l(/opera/i)||l(/opr/i)?(g[i]=e,g[t]=v||c("opr/")||c("opera[ /]")):l(/(msie|trident)/i)?(g[r]=e,g[t]=c("(msie |rv:)",2)):l(/chrome/i)?(g[s]=g[o]=e,g[t]=c(s+"/")):l(/phantom/i)?(g.phantom=g[o]=e,g[t]=c("phantomjs/")):l(/touchpad/i)?(g.touchpad=g[o]=e,g[t]=c("touchpad/")):h||p||d?(g.ios=g[n]=g[o]=e,g[t]=v,d?g.ipod=e:h?g.iphone=e:p&&(g.ipad=e)):l(/blackberry/i)?(g.blackberry=g[n]=e,v?(g[o]=e,g[t]=v):g[t]=c("blackberry[\\d]+/")):l(/webos/i)?(g.webos=g[n]=g[o]=e,g[t]=v||c("wosbrowser/")):l(/android/i)?(g.android=g[n]=g[o]=e,g[t]=v||m):l(/safari/i)?(g[u]=g[o]=e,g[t]=v):l(/gecko\//i)?(g.gecko=g.mozilla=e,g[t]=m,l(/firefox/i)&&(g.firefox=e)):l(/seamonkey\//i)?(g.seamonkey=e,g[t]=c("seamonkey/")):g[t]=0,y=g[t],g[r]&&y>=8||g[s]&&y>=10||g[a]&&y>=4||g[u]&&y>=5||g[i]&&y>=10?g.a=e:g[r]&&y<8||g[s]&&y<10||g[a]&&y<4||g[u]&&y<5||g[i]&&y<10?g.c=e:g.x=e,g}var e=!0,t="version",n="mobile",r="msie",i="opera",s="chrome",o="webkit",u="safari",a="firefox",l=f(typeof navigator!="undefined"?navigator.userAgent:"");return l._detect=f,l}) \ No newline at end of file diff --git a/src/bowser.js b/src/bowser.js index e5d1edc..0e787d8 100644 --- a/src/bowser.js +++ b/src/bowser.js @@ -84,12 +84,12 @@ if (uaTest(/windows phone/i)) { o.windowsphone = o[STR_MOBILE] = TRUE; o[STR_VERSION] = versionTest('iemobile\/'); + } else if (uaTest(/opera/i) || uaTest(/opr/i)) { + o[STR_OPERA] = TRUE; + o[STR_VERSION] = webkitVersion || versionTest('opr\/') || versionTest('opera[ \/]'); } else if (uaTest(/(msie|trident)/i)) { o[STR_MSIE] = TRUE; o[STR_VERSION] = versionTest('(msie |rv:)', 2); - } else if (uaTest(/opera/i) || uaTest(/opr/i)) { - o[STR_OPERA] = TRUE; - o[STR_VERSION] = webkitVersion || versionTest('opr\/'); } else if (uaTest(/chrome/i)) { o[STR_CHROME] = o[STR_WEBKIT] = TRUE; o[STR_VERSION] = versionTest(STR_CHROME + '\/'); diff --git a/src/useragents.js b/src/useragents.js index 574cc16..0b8804b 100644 --- a/src/useragents.js +++ b/src/useragents.js @@ -7,42 +7,274 @@ module.exports.useragents = { Chrome: { + 'Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.17 Safari/537.36': { + chrome: true, + 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, + 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, + 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, + 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, + 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, version: '11.0', webkit: true, a: 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, + version: '6.0', + webkit: true, + c: true } }, Opera: { + 'Opera/9.80 (Windows NT 6.0) Presto/2.12.388 Version/12.14': { + opera: true, + version: '12.14', + a: true + }, + 'Mozilla/5.0 (Windows NT 6.0; rv:2.0) Gecko/20100101 Firefox/4.0 Opera 12.14': { + opera: true, + version: '12.14', + a: true + }, + 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.0) Opera 12.14': { + opera: true, + version: '12.14', + a: true + }, + 'Opera/12.80 (Windows NT 5.1; U; en) Presto/2.10.289 Version/12.02': { + opera: true, + version: '12.02', + a: true + }, + 'Opera/9.80 (X11; Linux i686; U; es-ES) Presto/2.8.131 Version/11.11': { + opera: true, + version: '11.11', + a: true + }, 'Opera/9.80 (Macintosh; Intel Mac OS X 10.6.7; U; en) Presto/2.7.62 Version/11.01': { opera: true, version: '11.01', a: true + }, + 'Opera/9.80 (Windows NT 5.2; U; zh-cn) Presto/2.6.30 Version/10.63': { + opera: true, + version: '10.63', + a: true + }, + 'Opera/9.80 (X11; Linux i686; U; it) Presto/2.5.24 Version/10.54': { + opera: true, + version: '10.54', + a: true + }, + 'Opera/9.70 (Linux ppc64 ; U; en) Presto/2.2.1': { + opera: true, + version: '9.70', + c: true + }, + 'Opera/9.63 (X11; Linux i686)': { + opera: true, + version: '9.63', + c: true + }, + 'Mozilla/5.0 (X11; Linux i686; U; en) Opera 8.52': { + opera: true, + version: '8.52', + c: true } }, Safari: { + 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.13+ (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2': { + safari: true, + version: '5.1', + webkit: true, + a: true + }, 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1': { safari: true, version: '5.0', webkit: true, a: true - } + }, + 'Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU) AppleWebKit/533.18.1 (KHTML, like Gecko) Version/5.0.2 Safari/533.18.5': { + safari: true, + version: '5.0', + webkit: true, + a: true + }, + 'Mozilla/5.0 (X11; U; Linux x86_64; en-us) AppleWebKit/531.2+ (KHTML, like Gecko) Version/5.0 Safari/531.2+': { + safari: true, + version: '5.0', + webkit: true, + a: true + }, + 'Mozilla/5.0 (Windows; U; Windows NT 5.0; en-en) AppleWebKit/533.16 (KHTML, like Gecko) Version/4.1 Safari/533.16': { + safari: true, + version: '4.1', + webkit: true, + c: true + }, + 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_6_1; en_GB, en_US) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10': { + safari: true, + version: '4.0', + webkit: true, + c: true + }, + 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_7; de-de) AppleWebKit/525.28.3 (KHTML, like Gecko) Version/3.2.3 Safari/525.28.3': { + safari: true, + version: '3.2', + webkit: true, + c: true + }, }, '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': { + msie: true, + version: '11.0', + a: true + }, + 'Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0': { + msie: true, + version: '10.6', + a: true + }, + 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/4.0; InfoPath.2; SV1; .NET CLR 2.0.50727; WOW64)': { + msie: true, + version: '10.0', + a: true + }, + 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Win64; x64; Trident/5.0; .NET CLR 3.5.30729; .NET CLR 3.0.30729; .NET CLR 2.0.50727; Media Center PC 6.0)': { + msie: true, + version: '9.0', + a: true + }, 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C)': { msie: true, version: '8.0', a: true + }, + 'Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 5.1; .NET CLR 1.1.4322; InfoPath.1; .NET CLR 2.0.50727)': { + msie: true, + version: '7.0', + c: true + }, + 'Mozilla/4.0 (compatible; MSIE 6.1; Windows XP; .NET CLR 1.1.4322; .NET CLR 2.0.50727)': { + msie: true, + version: '6.1', + c: true + }, + 'Mozilla/4.0 (Compatible; Windows NT 5.1; MSIE 6.0) (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)': { + msie: true, + version: '6.0', + c: true + }, + 'Mozilla/4.0 (compatible; MSIE 5.01; Windows NT)': { + msie: true, + version: '5.01', + c: true } }, Firefox: { + 'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0': { + mozilla: true, + gecko: true, + firefox: true, + version: '25.0', + a: true + }, + 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:24.0) Gecko/20100101 Firefox/24.0': { + mozilla: true, + gecko: true, + firefox: true, + version: '24.0', + a: true + }, + 'Mozilla/5.0 (X11; Linux i686; rv:21.0) Gecko/20100101 Firefox/21.0': { + mozilla: true, + gecko: true, + firefox: true, + version: '21.0', + a: true + }, + 'Mozilla/5.0 (Windows NT 6.2; WOW64; rv:15.0) Gecko/20120910144328 Firefox/15.0.2': { + mozilla: true, + gecko: true, + firefox: true, + version: '15.0', + a: true + }, + 'Mozilla/5.0 (Windows; U; Windows NT 6.1; WOW64; en-US; rv:2.0.4) Gecko/20120718 AskTbAVR-IDW/3.12.5.17700 Firefox/14.0.1': { + mozilla: true, + gecko: true, + firefox: true, + version: '14.0', + a: true + }, + 'Mozilla/5.0 (Windows NT 5.1; rv:6.0) Gecko/20100101 Firefox/6.0 FirePHP/0.6': { + mozilla: true, + gecko: true, + firefox: true, + version: '6.0', + a: true + }, + 'Mozilla/5.0 (X11; Linux x86_64; rv:2.2a1pre) Gecko/20100101 Firefox/4.2a1pre': { + mozilla: true, + gecko: true, + firefox: true, + version: '4.2', + a: true + }, 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:2.0) Gecko/20100101 Firefox/4.0': { mozilla: true, gecko: true, firefox: true, version: '4.0', a: true + }, + 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2b1) Gecko/20091014 Firefox/3.6b1 GTB5': { + mozilla: true, + gecko: true, + firefox: true, + version: '3.6', + c: true + }, + 'Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.9.0.15) Gecko/2009101601 Firefox 2.1 (.NET CLR 3.5.30729)': { + mozilla: true, + gecko: true, + firefox: true, + version: '2.1', + c: true + }, + 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061014 Firefox/1.5.0.7': { + mozilla: true, + gecko: true, + firefox: true, + version: '1.5', + c: true } }, iPhone: { @@ -53,9 +285,49 @@ module.exports.useragents = { mobile: true, webkit: true, x: 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, + 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, + version: '4.0', + iphone: true, + mobile: true, + webkit: true, + x: 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, + mobile: true, + webkit: true, + x: true } }, 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, + version: '6.0', + ipad: true, + mobile: true, + webkit: true, + x: 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, + version: '5.1', + ipad: true, + mobile: true, + webkit: true, + x: 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, version: '5.0', @@ -63,8 +335,91 @@ module.exports.useragents = { mobile: true, webkit: true, x: 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, + version: '4.0', + ipad: true, + mobile: true, + webkit: true, + x: true + }, + }, + iPod: { + '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, + version: '5.0', + ipod: true, + mobile: true, + webkit: true, + x: 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', + ipod: true, + mobile: true, + webkit: true, + x: true + } + }, + BlackBerry: { + 'Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.1.0.346 Mobile Safari/534.11+': { + blackberry: true, + version: '7.1', + webkit: true, + mobile: true, + x: true + }, + 'Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en-US) AppleWebKit/534.8+ (KHTML, like Gecko) Version/6.0.0.450 Mobile Safari/534.8+': { + blackberry: true, + version: '6.0', + webkit: true, + mobile: true, + x: true + }, + 'BlackBerry9800/5.0.0.862 Profile/MIDP-2.1 Configuration/CLDC-1.1 VendorID/331 UNTRUSTED/1.0 3gpp-gba': { + blackberry: true, + version: '5.0', + mobile: true, + x: true + }, + 'BlackBerry8320/4.5.0.52 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/179': { + blackberry: true, + version: '4.5', + mobile: true, + x: true + } + }, + 'Windows Phone': { + 'Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 920)': { + windowsphone: true, + version: '10.0', + mobile: true, + x: true + }, + 'Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0)': { + windowsphone: true, + version: '9.0', + mobile: true, + x: true + }, + 'Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; Nokia;N70)': { + windowsphone: true, + version: '7.0', + mobile: true, + x: true } }, + WebOS: { + 'Mozilla/5.0 (webOS/1.0; U; en-US) AppleWebKit/525.27.1 (KHTML, like Gecko) Version/1.0 Safari/525.27.1 Pre/1.0': { + webos: true, + webkit: true, + version: '1.0', + mobile: true, + x: true + }, + }, 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, @@ -72,6 +427,13 @@ module.exports.useragents = { version: 4.0, mobile: true, x: true + }, + '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, + webkit: true, + version: 3.1, + mobile: true, + x: true } }, Touchpad: {