Comparing version 0.3.3 to 0.3.4
@@ -30,3 +30,3 @@ /*! | ||
, ie = /(msie|trident)/i.test(ua) | ||
, chrome = /chrome/i.test(ua) | ||
, chrome = /chrome|crios/i.test(ua) | ||
, phantom = /phantom/i.test(ua) | ||
@@ -49,16 +49,20 @@ , safari = /safari/i.test(ua) && !chrome && !phantom | ||
if (ie) return { | ||
msie: t | ||
name: 'Internet Explorer' | ||
, msie: t | ||
, version: ua.match(/(msie |rv:)(\d+(\.\d+)?)/i)[2] | ||
} | ||
if (opera) return { | ||
opera: t | ||
name: 'Opera' | ||
, opera: t | ||
, version: ua.match(webkitVersion) ? ua.match(webkitVersion)[1] : ua.match(/opr\/(\d+(\.\d+)?)/i)[1] | ||
} | ||
if (chrome) return { | ||
webkit: t | ||
name: 'Chrome' | ||
, webkit: t | ||
, chrome: t | ||
, version: ua.match(/chrome\/(\d+(\.\d+)?)/i)[1] | ||
, version: ua.match(/(?:chrome|crios)\/(\d+(\.\d+)?)/i)[1] | ||
} | ||
if (phantom) return { | ||
webkit: t | ||
name: 'PhantomJS' | ||
, webkit: t | ||
, phantom: t | ||
@@ -68,3 +72,4 @@ , version: ua.match(/phantomjs\/(\d+(\.\d+)+)/i)[1] | ||
if (touchpad) return { | ||
webkit: t | ||
name: 'TouchPad' | ||
, webkit: t | ||
, touchpad: t | ||
@@ -75,3 +80,4 @@ , version : ua.match(/touchpad\/(\d+(\.\d+)?)/i)[1] | ||
o = { | ||
webkit: t | ||
name : iphone ? 'iPhone' : 'iPad' | ||
, webkit: t | ||
, mobile: t | ||
@@ -89,3 +95,4 @@ , ios: t | ||
if (android) return { | ||
webkit: t | ||
name: 'Android' | ||
, webkit: t | ||
, android: t | ||
@@ -96,3 +103,4 @@ , mobile: t | ||
if (safari) return { | ||
webkit: t | ||
name: 'Safari' | ||
, webkit: t | ||
, safari: t | ||
@@ -103,11 +111,16 @@ , version: ua.match(webkitVersion)[1] | ||
o = { | ||
gecko: t | ||
name: 'Gecko' | ||
, gecko: t | ||
, mozilla: t | ||
, version: ua.match(firefoxVersion)[1] | ||
} | ||
if (firefox) o.firefox = t | ||
if (firefox) { | ||
o.name = 'Firefox'; | ||
o.firefox = t; | ||
} | ||
return o | ||
} | ||
if (seamonkey) return { | ||
seamonkey: t | ||
name: 'SeaMonkey' | ||
, seamonkey: t | ||
, version: ua.match(/seamonkey\/(\d+(\.\d+)?)/i)[1] | ||
@@ -114,0 +127,0 @@ } |
@@ -6,2 +6,2 @@ /*! | ||
*/ | ||
!function(e,t){typeof define=="function"?define(t):typeof module!="undefined"&&module.exports?module.exports.browser=t():this[e]=t()}("bowser",function(){function g(){return n?{msie:t,version:e.match(/(msie |rv:)(\d+(\.\d+)?)/i)[2]}:l?{opera:t,version:e.match(d)?e.match(d)[1]:e.match(/opr\/(\d+(\.\d+)?)/i)[1]}:r?{webkit:t,chrome:t,version:e.match(/chrome\/(\d+(\.\d+)?)/i)[1]}:i?{webkit:t,phantom:t,version:e.match(/phantomjs\/(\d+(\.\d+)+)/i)[1]}:a?{webkit:t,touchpad:t,version:e.match(/touchpad\/(\d+(\.\d+)?)/i)[1]}:o||u?(m={webkit:t,mobile:t,ios:t,iphone:o,ipad:u},d.test(e)&&(m.version=e.match(d)[1]),m):f?{webkit:t,android:t,mobile:t,version:(e.match(d)||e.match(v))[1]}:s?{webkit:t,safari:t,version:e.match(d)[1]}:h?(m={gecko:t,mozilla:t,version:e.match(v)[1]},c&&(m.firefox=t),m):p?{seamonkey:t,version:e.match(/seamonkey\/(\d+(\.\d+)?)/i)[1]}:{}}var e=navigator.userAgent,t=!0,n=/(msie|trident)/i.test(e),r=/chrome/i.test(e),i=/phantom/i.test(e),s=/safari/i.test(e)&&!r&&!i,o=/iphone/i.test(e),u=/ipad/i.test(e),a=/touchpad/i.test(e),f=/android/i.test(e),l=/opera/i.test(e)||/opr/i.test(e),c=/firefox/i.test(e),h=/gecko\//i.test(e),p=/seamonkey\//i.test(e),d=/version\/(\d+(\.\d+)?)/i,v=/firefox\/(\d+(\.\d+)?)/i,m,y=g();return y.msie&&y.version>=8||y.chrome&&y.version>=10||y.firefox&&y.version>=4||y.safari&&y.version>=5||y.opera&&y.version>=10?y.a=t:y.msie&&y.version<8||y.chrome&&y.version<10||y.firefox&&y.version<4||y.safari&&y.version<5||y.opera&&y.version<10?y.c=t:y.x=t,y}) | ||
!function(e,t){typeof define=="function"?define(t):typeof module!="undefined"&&module.exports?module.exports.browser=t():this[e]=t()}("bowser",function(){function g(){return n?{name:"Internet Explorer",msie:t,version:e.match(/(msie |rv:)(\d+(\.\d+)?)/i)[2]}:l?{name:"Opera",opera:t,version:e.match(d)?e.match(d)[1]:e.match(/opr\/(\d+(\.\d+)?)/i)[1]}:r?{name:"Chrome",webkit:t,chrome:t,version:e.match(/(?:chrome|crios)\/(\d+(\.\d+)?)/i)[1]}:i?{name:"PhantomJS",webkit:t,phantom:t,version:e.match(/phantomjs\/(\d+(\.\d+)+)/i)[1]}:a?{name:"TouchPad",webkit:t,touchpad:t,version:e.match(/touchpad\/(\d+(\.\d+)?)/i)[1]}:o||u?(m={name:o?"iPhone":"iPad",webkit:t,mobile:t,ios:t,iphone:o,ipad:u},d.test(e)&&(m.version=e.match(d)[1]),m):f?{name:"Android",webkit:t,android:t,mobile:t,version:(e.match(d)||e.match(v))[1]}:s?{name:"Safari",webkit:t,safari:t,version:e.match(d)[1]}:h?(m={name:"Gecko",gecko:t,mozilla:t,version:e.match(v)[1]},c&&(m.name="Firefox",m.firefox=t),m):p?{name:"SeaMonkey",seamonkey:t,version:e.match(/seamonkey\/(\d+(\.\d+)?)/i)[1]}:{}}var e=navigator.userAgent,t=!0,n=/(msie|trident)/i.test(e),r=/chrome|crios/i.test(e),i=/phantom/i.test(e),s=/safari/i.test(e)&&!r&&!i,o=/iphone/i.test(e),u=/ipad/i.test(e),a=/touchpad/i.test(e),f=/android/i.test(e),l=/opera/i.test(e)||/opr/i.test(e),c=/firefox/i.test(e),h=/gecko\//i.test(e),p=/seamonkey\//i.test(e),d=/version\/(\d+(\.\d+)?)/i,v=/firefox\/(\d+(\.\d+)?)/i,m,y=g();return y.msie&&y.version>=8||y.chrome&&y.version>=10||y.firefox&&y.version>=4||y.safari&&y.version>=5||y.opera&&y.version>=10?y.a=t:y.msie&&y.version<8||y.chrome&&y.version<10||y.firefox&&y.version<4||y.safari&&y.version<5||y.opera&&y.version<10?y.c=t:y.x=t,y}) |
@@ -5,3 +5,3 @@ { | ||
, "keywords": ["ender", "browser", "sniff", "detection"] | ||
, "version": "0.3.3" | ||
, "version": "0.3.4" | ||
, "homepage": "https://github.com/ded/bowser" | ||
@@ -8,0 +8,0 @@ , "author": "Dustin Diaz <dustin@dustindiaz.com> (http://dustindiaz.com)" |
@@ -24,3 +24,3 @@ !function (name, definition) { | ||
, ie = /(msie|trident)/i.test(ua) | ||
, chrome = /chrome/i.test(ua) | ||
, chrome = /chrome|crios/i.test(ua) | ||
, phantom = /phantom/i.test(ua) | ||
@@ -43,16 +43,20 @@ , safari = /safari/i.test(ua) && !chrome && !phantom | ||
if (ie) return { | ||
msie: t | ||
name: 'Internet Explorer' | ||
, msie: t | ||
, version: ua.match(/(msie |rv:)(\d+(\.\d+)?)/i)[2] | ||
} | ||
if (opera) return { | ||
opera: t | ||
name: 'Opera' | ||
, opera: t | ||
, version: ua.match(webkitVersion) ? ua.match(webkitVersion)[1] : ua.match(/opr\/(\d+(\.\d+)?)/i)[1] | ||
} | ||
if (chrome) return { | ||
webkit: t | ||
name: 'Chrome' | ||
, webkit: t | ||
, chrome: t | ||
, version: ua.match(/chrome\/(\d+(\.\d+)?)/i)[1] | ||
, version: ua.match(/(?:chrome|crios)\/(\d+(\.\d+)?)/i)[1] | ||
} | ||
if (phantom) return { | ||
webkit: t | ||
name: 'PhantomJS' | ||
, webkit: t | ||
, phantom: t | ||
@@ -62,3 +66,4 @@ , version: ua.match(/phantomjs\/(\d+(\.\d+)+)/i)[1] | ||
if (touchpad) return { | ||
webkit: t | ||
name: 'TouchPad' | ||
, webkit: t | ||
, touchpad: t | ||
@@ -69,3 +74,4 @@ , version : ua.match(/touchpad\/(\d+(\.\d+)?)/i)[1] | ||
o = { | ||
webkit: t | ||
name : iphone ? 'iPhone' : 'iPad' | ||
, webkit: t | ||
, mobile: t | ||
@@ -83,3 +89,4 @@ , ios: t | ||
if (android) return { | ||
webkit: t | ||
name: 'Android' | ||
, webkit: t | ||
, android: t | ||
@@ -90,3 +97,4 @@ , mobile: t | ||
if (safari) return { | ||
webkit: t | ||
name: 'Safari' | ||
, webkit: t | ||
, safari: t | ||
@@ -97,11 +105,16 @@ , version: ua.match(webkitVersion)[1] | ||
o = { | ||
gecko: t | ||
name: 'Gecko' | ||
, gecko: t | ||
, mozilla: t | ||
, version: ua.match(firefoxVersion)[1] | ||
} | ||
if (firefox) o.firefox = t | ||
if (firefox) { | ||
o.name = 'Firefox'; | ||
o.firefox = t; | ||
} | ||
return o | ||
} | ||
if (seamonkey) return { | ||
seamonkey: t | ||
name: 'SeaMonkey' | ||
, seamonkey: t | ||
, version: ua.match(/seamonkey\/(\d+(\.\d+)?)/i)[1] | ||
@@ -108,0 +121,0 @@ } |
14314
304