From cc27fc5f28582052efcfac79b2308288eb55b075 Mon Sep 17 00:00:00 2001 From: Dustin Diaz Date: Fri, 21 Feb 2014 08:33:01 -0800 Subject: [PATCH 1/3] update copyright date --- src/copyright.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/copyright.js b/src/copyright.js index efc64e0..3e2638c 100644 --- a/src/copyright.js +++ b/src/copyright.js @@ -1,5 +1,5 @@ /*! * Bowser - a browser detector * https://github.com/ded/bowser - * MIT License | (c) Dustin Diaz 2013 + * MIT License | (c) Dustin Diaz 2014 */ From bd319d48148f36c577ade389be17925a5917b8e0 Mon Sep 17 00:00:00 2001 From: Dustin Diaz Date: Fri, 21 Feb 2014 08:37:47 -0800 Subject: [PATCH 2/3] rebuild --- bowser.js | 164 +++++++++++++++++++++++++------------------------- bowser.min.js | 4 +- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/bowser.js b/bowser.js index 4760640..c2c25f3 100644 --- a/bowser.js +++ b/bowser.js @@ -1,7 +1,7 @@ /*! * Bowser - a browser detector * https://github.com/ded/bowser - * MIT License | (c) Dustin Diaz 2013 + * MIT License | (c) Dustin Diaz 2014 */ !function (name, definition) { @@ -9,57 +9,51 @@ else if (typeof define == 'function') define(definition) else this[name] = definition() }('bowser', function () { - /** - * navigator.userAgent => - * Chrome: "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" - * Opera: "Opera/9.80 (Macintosh; Intel Mac OS X 10.6.7; U; en) Presto/2.7.62 Version/11.01" - * Safari: "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" - * IE: "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)" - * IE>=11: "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" - * Firefox: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:2.0) Gecko/20100101 Firefox/4.0" - * 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" - * iPad: "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", - * iPod: "Mozilla/5.0 (iPod; U; CPU iPhone OS 4_3_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5" - * 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" - * PhantomJS: "Mozilla/5.0 (Macintosh; Intel Mac OS X) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.5.0 Safari/534.34" - * Amazon Silk: "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.0.22.153_10033210) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16 Silk-Accelerated=true" + /** + * See useragents.js for examples of navigator.userAgent */ - var ua = navigator.userAgent - , t = true - , ie = /(msie|trident)/i.test(ua) - , chrome = /chrome|crios/i.test(ua) - , phantom = /phantom/i.test(ua) - , iphone = /iphone/i.test(ua) - , ipad = /ipad/i.test(ua) - , ipod = /ipod/i.test(ua) - , touchpad = /touchpad/i.test(ua) - , silk = /silk/i.test(ua) - , safari = /safari/i.test(ua) && !chrome && !phantom && !silk - , android = /android/i.test(ua) - , opera = /opera/i.test(ua) || /opr/i.test(ua) - , firefox = /firefox/i.test(ua) - , gecko = /gecko\//i.test(ua) - , seamonkey = /seamonkey\//i.test(ua) - , webkitVersion = /version\/(\d+(\.\d+)?)/i - , firefoxVersion = /firefox\/(\d+(\.\d+)?)/i - , mobile = /mobile/i.test(ua) - , o + var t = true, + v /* temporary placeholder for versions. */ - function detect() { + function detect(ua) { - if (ie) return { + var ie = /(msie|trident)/i.test(ua) + , chrome = /chrome|crios/i.test(ua) + , phantom = /phantom/i.test(ua) + , iphone = /iphone/i.test(ua) + , ipad = /ipad/i.test(ua) + , ipod = /ipod/i.test(ua) + , touchpad = /touchpad/i.test(ua) + , silk = /silk/i.test(ua) + , safari = /safari/i.test(ua) && !chrome && !phantom && !silk + , android = /android/i.test(ua) + , opera = /opera/i.test(ua) || /opr/i.test(ua) + , firefox = /firefox/i.test(ua) + , gecko = /gecko\//i.test(ua) + , seamonkey = /seamonkey\//i.test(ua) + , webkitVersion = /version\/(\d+(\.\d+)?)/i + // , firefoxVersion = /firefox\/(\d+(\.\d+)?)/i + , firefoxVersion = /firefox[ \/](\d+(\.\d+)?)/i + , mobile = /mobile/i.test(ua) + , o = {} + + if (opera) { + if ((v = ua.match(webkitVersion)) && v.length > 1) v = v[1] + else if ((v = ua.match(/opr\/(\d+(\.\d+)?)/i)) && v.length > 1) v = v[1] + else if ((v = ua.match(/opera[ \/](\d+(\.\d+)?)/i)) && v.length > 1) v = v[1] + else v = 0 + o = { + name: 'Opera' + , opera: t + , version: v + } + } else if (ie) o = { name: 'Internet Explorer' , msie: t , version: ua.match(/(msie |rv:)(\d+(\.\d+)?)/i)[2] } - if (opera) return { - name: 'Opera' - , opera: t - , version: ua.match(webkitVersion) ? ua.match(webkitVersion)[1] : ua.match(/opr\/(\d+(\.\d+)?)/i)[1] - } - if (chrome) return { + else if (chrome) o = { name: 'Chrome' , webkit: t , chrome: t @@ -69,27 +63,26 @@ , ios: !!ua.match(/crios/i) , mobile: mobile } - if (phantom) return { + else if (phantom) o = { name: 'PhantomJS' , webkit: t , phantom: t - , version: ua.match(/phantomjs\/(\d+(\.\d+)+)/i)[1] + , version: ua.match(/phantomjs\/(\d+(\.\d+)?)/i)[1] } - if (touchpad) return { + else if (touchpad) o = { name: 'TouchPad' , webkit: t , touchpad: t , version : ua.match(/touchpad\/(\d+(\.\d+)?)/i)[1] } - - if (silk) return { - name: 'Amazon Silk' - , webkit: t - , android: t - , mobile: t - , version : ua.match(/silk\/(\d+(\.\d+)?)/i)[1] - } - if (iphone || ipad || ipod) { + else if (silk) o = { + name: 'Amazon Silk' + , webkit: t + , android: t + , mobile: t + , version : ua.match(/silk\/(\d+(\.\d+)?)/i)[1] + } + else if (iphone || ipad || ipod) { o = { name : iphone ? 'iPhone' : ipad ? 'iPad' : 'iPod' , webkit: t @@ -103,61 +96,68 @@ if (webkitVersion.test(ua)) { o.version = ua.match(webkitVersion)[1] } - return o } - if (android) return { + else if (android) o = { name: 'Android' , webkit: t , android: t , mobile: t , version: (ua.match(webkitVersion) || ua.match(firefoxVersion))[1] } - if (safari) return { + else if (safari) o = { name: 'Safari' , webkit: t , safari: t - , version: ua.match(webkitVersion)[1] + , version: ((v = ua.match(webkitVersion)) ? v[1] : 0) } - if (gecko) { + else if (gecko) { o = { name: 'Gecko' , gecko: t , mozilla: t - , version: ua.match(firefoxVersion)[1] + , version: ((v = ua.match(firefoxVersion)) && v? v[1] : 0) } if (firefox) { o.name = 'Firefox'; o.firefox = t; } - return o } - if (seamonkey) return { + else if (seamonkey) o = { name: 'SeaMonkey' , seamonkey: t , version: ua.match(/seamonkey\/(\d+(\.\d+)?)/i)[1] } - return {} - } - var bowser = detect() + // 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.a = t; + } + + else 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.c = t + } else o.x = t - // Graded Browser Support - // http://developer.yahoo.com/yui/articles/gbs - if ((bowser.msie && bowser.version >= 9) || - (bowser.chrome && bowser.version >= 20) || - (bowser.firefox && bowser.version >= 10.0) || - (bowser.safari && bowser.version >= 5) || - (bowser.opera && bowser.version >= 10.0)) { - bowser.a = t; + return o } - else if ((bowser.msie && bowser.version < 9) || - (bowser.chrome && bowser.version < 20) || - (bowser.firefox && bowser.version < 10.0) || - (bowser.safari && bowser.version < 5) || - (bowser.opera && bowser.version < 10.0)) { - bowser.c = t - } else bowser.x = t + var bowser = detect(typeof navigator !== 'undefined' ? navigator.userAgent : '') + + + /* + * Set our detect method to the main bowser object so we can + * reuse it to test other user agents. + * This is needed to implement future tests. + */ + bowser._detect = detect; return bowser }); diff --git a/bowser.min.js b/bowser.min.js index 1dc92af..d48ce81 100644 --- a/bowser.min.js +++ b/bowser.min.js @@ -1,6 +1,6 @@ /*! * Bowser - a browser detector * https://github.com/ded/bowser - * MIT License | (c) Dustin Diaz 2013 + * MIT License | (c) Dustin Diaz 2014 */ -!function(e,t){typeof module!="undefined"&&module.exports?module.exports.browser=t():typeof define=="function"?define(t):this[e]=t()}("bowser",function(){function w(){return n?{name:"Internet Explorer",msie:t,version:e.match(/(msie |rv:)(\d+(\.\d+)?)/i)[2]}:h?{name:"Opera",opera:t,version:e.match(m)?e.match(m)[1]:e.match(/opr\/(\d+(\.\d+)?)/i)[1]}:r?{name:"Chrome",webkit:t,chrome:t,version:e.match(/(?:chrome|crios)\/(\d+(\.\d+)?)/i)[1],ipad:o,iphone:s,ios:!!e.match(/crios/i),mobile:y}: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]}:f?{name:"Amazon Silk",webkit:t,android:t,mobile:t,version:e.match(/silk\/(\d+(\.\d+)?)/i)[1]}:s||o||u?(b={name:s?"iPhone":o?"iPad":"iPod",webkit:t,mobile:s,ios:t,iphone:s,ipad:o,ipod:u},m.test(e)&&(b.version=e.match(m)[1]),b):c?{name:"Android",webkit:t,android:t,mobile:t,version:(e.match(m)||e.match(g))[1]}:l?{name:"Safari",webkit:t,safari:t,version:e.match(m)[1]}:d?(b={name:"Gecko",gecko:t,mozilla:t,version:e.match(g)[1]},p&&(b.name="Firefox",b.firefox=t),b):v?{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=/iphone/i.test(e),o=/ipad/i.test(e),u=/ipod/i.test(e),a=/touchpad/i.test(e),f=/silk/i.test(e),l=/safari/i.test(e)&&!r&&!i&&!f,c=/android/i.test(e),h=/opera/i.test(e)||/opr/i.test(e),p=/firefox/i.test(e),d=/gecko\//i.test(e),v=/seamonkey\//i.test(e),m=/version\/(\d+(\.\d+)?)/i,g=/firefox\/(\d+(\.\d+)?)/i,y=/mobile/i.test(e),b,E=w();return E.msie&&E.version>=9||E.chrome&&E.version>=20||E.firefox&&E.version>=10||E.safari&&E.version>=5||E.opera&&E.version>=10?E.a=t:E.msie&&E.version<9||E.chrome&&E.version<20||E.firefox&&E.version<10||E.safari&&E.version<5||E.opera&&E.version<10?E.c=t:E.x=t,E}) \ No newline at end of file +!function(e,t){typeof module!="undefined"&&module.exports?module.exports.browser=t():typeof define=="function"?define(t):this[e]=t()}("bowser",function(){function n(n){var r=/(msie|trident)/i.test(n),i=/chrome|crios/i.test(n),s=/phantom/i.test(n),o=/iphone/i.test(n),u=/ipad/i.test(n),a=/ipod/i.test(n),f=/touchpad/i.test(n),l=/silk/i.test(n),c=/safari/i.test(n)&&!i&&!s&&!l,h=/android/i.test(n),p=/opera/i.test(n)||/opr/i.test(n),d=/firefox/i.test(n),m=/gecko\//i.test(n),g=/seamonkey\//i.test(n),y=/version\/(\d+(\.\d+)?)/i,b=/firefox[ \/](\d+(\.\d+)?)/i,w=/mobile/i.test(n),E={};return p?((t=n.match(y))&&t.length>1?t=t[1]:(t=n.match(/opr\/(\d+(\.\d+)?)/i))&&t.length>1?t=t[1]:(t=n.match(/opera[ \/](\d+(\.\d+)?)/i))&&t.length>1?t=t[1]:t=0,E={name:"Opera",opera:e,version:t}):r?E={name:"Internet Explorer",msie:e,version:n.match(/(msie |rv:)(\d+(\.\d+)?)/i)[2]}:i?E={name:"Chrome",webkit:e,chrome:e,version:n.match(/(?:chrome|crios)\/(\d+(\.\d+)?)/i)[1],ipad:u,iphone:o,ios:!!n.match(/crios/i),mobile:w}:s?E={name:"PhantomJS",webkit:e,phantom:e,version:n.match(/phantomjs\/(\d+(\.\d+)?)/i)[1]}:f?E={name:"TouchPad",webkit:e,touchpad:e,version:n.match(/touchpad\/(\d+(\.\d+)?)/i)[1]}:l?E={name:"Amazon Silk",webkit:e,android:e,mobile:e,version:n.match(/silk\/(\d+(\.\d+)?)/i)[1]}:o||u||a?(E={name:o?"iPhone":u?"iPad":"iPod",webkit:e,mobile:o,ios:e,iphone:o,ipad:u,ipod:a},y.test(n)&&(E.version=n.match(y)[1])):h?E={name:"Android",webkit:e,android:e,mobile:e,version:(n.match(y)||n.match(b))[1]}:c?E={name:"Safari",webkit:e,safari:e,version:(t=n.match(y))?t[1]:0}:m?(E={name:"Gecko",gecko:e,mozilla:e,version:(t=n.match(b))&&t?t[1]:0},d&&(E.name="Firefox",E.firefox=e)):g&&(E={name:"SeaMonkey",seamonkey:e,version:n.match(/seamonkey\/(\d+(\.\d+)?)/i)[1]}),E.msie&&E.version>=9||E.chrome&&E.version>=20||E.firefox&&E.version>=10||E.safari&&E.version>=5||E.opera&&E.version>=10?E.a=e:E.msie&&E.version<9||E.chrome&&E.version<20||E.firefox&&E.version<10||E.safari&&E.version<5||E.opera&&E.version<10?E.c=e:E.x=e,E}var e=!0,t,r=n(typeof navigator!="undefined"?navigator.userAgent:"");return r._detect=n,r}) \ No newline at end of file From 1bbfe34a2c710d04fc779c0ff00e9968362fcab6 Mon Sep 17 00:00:00 2001 From: Dustin Diaz Date: Fri, 21 Feb 2014 08:37:53 -0800 Subject: [PATCH 3/3] 0.4.0 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 7cb4fd7..4c9c4df 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "sniff", "detection" ], - "version": "0.3.9", + "version": "0.4.0", "homepage": "https://github.com/ded/bowser", "author": "Dustin Diaz (http://dustindiaz.com)", "main": "./bowser.js", @@ -16,7 +16,7 @@ "url": "https://github.com/ded/bowser.git" }, "devDependencies": { - "smoosh": "*" - , "mocha": "*" + "smoosh": "*", + "mocha": "*" } }