Comparing version 0.1.0 to 0.2.0
@@ -21,2 +21,3 @@ /*! | ||
* 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" | ||
* Touchpad: "Mozilla/5.0 (hp-tabled;Linux;hpwOS/3.0.5; U; en-US)) AppleWebKit/534.6 (KHTML, like Gecko) wOSBrowser/234.83 Safari/534.6 TouchPad/1.0" | ||
*/ | ||
@@ -31,2 +32,3 @@ | ||
, ipad = /ipad/i.test(ua) | ||
, touchpad = /touchpad/i.test(ua) | ||
, android = /android/i.test(ua) | ||
@@ -51,2 +53,7 @@ , opera = /opera/i.test(ua) | ||
} | ||
if (touchpad) return { | ||
webkit: t | ||
, touchpad: t | ||
, version : ua.match(/touchpad\/(\d+(\.\d+)?)/i)[1] | ||
} | ||
if (iphone || ipad) { | ||
@@ -100,3 +107,3 @@ o = { | ||
// http://developer.yahoo.com/yui/articles/gbs | ||
if ((bowser.msie && bowser.version >= 6) || | ||
if ((bowser.msie && bowser.version >= 7) || | ||
(bowser.chrome && bowser.version >= 10) || | ||
@@ -109,3 +116,3 @@ (bowser.firefox && bowser.version >= 4.0) || | ||
else if ((bowser.msie && bowser.version < 6) || | ||
else if ((bowser.msie && bowser.version < 7) || | ||
(bowser.chrome && bowser.version < 10) || | ||
@@ -112,0 +119,0 @@ (bowser.firefox && bowser.version < 4.0) || |
@@ -6,2 +6,2 @@ /*! | ||
*/ | ||
!function(a,b){typeof define=="function"?define(b):typeof module!="undefined"&&module.exports?module.exports.browser=b():this[a]=b()}("bowser",function(){function o(){if(c)return{msie:b,version:a.match(/msie (\d+(\.\d+)?);/i)[1]};if(d)return{webkit:b,chrome:b,version:a.match(/chrome\/(\d+(\.\d+)?)/i)[1]};if(f||g)return n={webkit:b,mobile:b,ios:b,iphone:f,ipad:g},m.test(a)&&(n.version=a.match(m)[1]),n;if(h)return{webkit:b,android:b,mobile:b,version:a.match(m)[1]};if(e)return{webkit:b,safari:b,version:a.match(m)[1]};if(i)return{opera:b,version:a.match(m)[1]};if(k)return n={gecko:b,mozilla:b,version:a.match(/firefox\/(\d+(\.\d+)?)/i)[1]},j&&(n.firefox=b),n;if(l)return{seamonkey:b,version:a.match(/seamonkey\/(\d+(\.\d+)?)/i)[1]}}var a=navigator.userAgent,b=!0,c=/msie/i.test(a),d=/chrome/i.test(a),e=/safari/i.test(a)&&!d,f=/iphone/i.test(a),g=/ipad/i.test(a),h=/android/i.test(a),i=/opera/i.test(a),j=/firefox/i.test(a),k=/gecko\//i.test(a),l=/seamonkey\//i.test(a),m=/version\/(\d+(\.\d+)?)/i,n,p=o();return p.msie&&p.version>=6||p.chrome&&p.version>=10||p.firefox&&p.version>=4||p.safari&&p.version>=5||p.opera&&p.version>=10?p.a=b:p.msie&&p.version<6||p.chrome&&p.version<10||p.firefox&&p.version<4||p.safari&&p.version<5||p.opera&&p.version<10?p.c=b:p.x=b,p}) | ||
!function(a,b){typeof define=="function"?define(b):typeof module!="undefined"&&module.exports?module.exports.browser=b():this[a]=b()}("bowser",function(){function p(){if(c)return{msie:b,version:a.match(/msie (\d+(\.\d+)?);/i)[1]};if(d)return{webkit:b,chrome:b,version:a.match(/chrome\/(\d+(\.\d+)?)/i)[1]};if(h)return{webkit:b,touchpad:b,version:a.match(/touchpad\/(\d+(\.\d+)?)/i)[1]};if(f||g){o={webkit:b,mobile:b,ios:b,iphone:f,ipad:g},n.test(a)&&(o.version=a.match(n)[1]);return o}if(i)return{webkit:b,android:b,mobile:b,version:a.match(n)[1]};if(e)return{webkit:b,safari:b,version:a.match(n)[1]};if(j)return{opera:b,version:a.match(n)[1]};if(l){o={gecko:b,mozilla:b,version:a.match(/firefox\/(\d+(\.\d+)?)/i)[1]},k&&(o.firefox=b);return o}if(m)return{seamonkey:b,version:a.match(/seamonkey\/(\d+(\.\d+)?)/i)[1]}}var a=navigator.userAgent,b=!0,c=/msie/i.test(a),d=/chrome/i.test(a),e=/safari/i.test(a)&&!d,f=/iphone/i.test(a),g=/ipad/i.test(a),h=/touchpad/i.test(a),i=/android/i.test(a),j=/opera/i.test(a),k=/firefox/i.test(a),l=/gecko\//i.test(a),m=/seamonkey\//i.test(a),n=/version\/(\d+(\.\d+)?)/i,o,q=p();q.msie&&q.version>=7||q.chrome&&q.version>=10||q.firefox&&q.version>=4||q.safari&&q.version>=5||q.opera&&q.version>=10?q.a=b:q.msie&&q.version<7||q.chrome&&q.version<10||q.firefox&&q.version<4||q.safari&&q.version<5||q.opera&&q.version<10?q.c=b:q.x=b;return q}) |
@@ -5,3 +5,3 @@ { | ||
, "keywords": ["ender", "browser", "sniff", "detection"] | ||
, "version": "0.1.0" | ||
, "version": "0.2.0" | ||
, "homepage": "https://github.com/ded/bowser" | ||
@@ -8,0 +8,0 @@ , "author": "Dustin Diaz <dustin@dustindiaz.com> (http://dustindiaz.com)" |
@@ -16,2 +16,3 @@ !function (name, definition) { | ||
* 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" | ||
* Touchpad: "Mozilla/5.0 (hp-tabled;Linux;hpwOS/3.0.5; U; en-US)) AppleWebKit/534.6 (KHTML, like Gecko) wOSBrowser/234.83 Safari/534.6 TouchPad/1.0" | ||
*/ | ||
@@ -26,2 +27,3 @@ | ||
, ipad = /ipad/i.test(ua) | ||
, touchpad = /touchpad/i.test(ua) | ||
, android = /android/i.test(ua) | ||
@@ -46,2 +48,7 @@ , opera = /opera/i.test(ua) | ||
} | ||
if (touchpad) return { | ||
webkit: t | ||
, touchpad: t | ||
, version : ua.match(/touchpad\/(\d+(\.\d+)?)/i)[1] | ||
} | ||
if (iphone || ipad) { | ||
@@ -95,3 +102,3 @@ o = { | ||
// http://developer.yahoo.com/yui/articles/gbs | ||
if ((bowser.msie && bowser.version >= 6) || | ||
if ((bowser.msie && bowser.version >= 7) || | ||
(bowser.chrome && bowser.version >= 10) || | ||
@@ -104,3 +111,3 @@ (bowser.firefox && bowser.version >= 4.0) || | ||
else if ((bowser.msie && bowser.version < 6) || | ||
else if ((bowser.msie && bowser.version < 7) || | ||
(bowser.chrome && bowser.version < 10) || | ||
@@ -107,0 +114,0 @@ (bowser.firefox && bowser.version < 4.0) || |
12137
257