From 351a6bc386eecca96e62f8f4cceee1ca17888e01 Mon Sep 17 00:00:00 2001 From: Jason Scott Date: Tue, 18 Dec 2012 15:30:58 -0500 Subject: [PATCH] Detect: Added BB10 to detectable os's --- src/detect.js | 4 +++- test/detect.html | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/detect.js b/src/detect.js index 7d0f6bbfe..19f1267ac 100644 --- a/src/detect.js +++ b/src/detect.js @@ -14,6 +14,7 @@ kindle = ua.match(/Kindle\/([\d.]+)/), silk = ua.match(/Silk\/([\d._]+)/), blackberry = ua.match(/(BlackBerry).*Version\/([\d.]+)/), + bb10 = ua.match(/(BB10).*Version\/([\d.]+)/), rimtabletos = ua.match(/(RIM\sTablet\sOS)\s([\d.]+)/), playbook = ua.match(/PlayBook/), chrome = ua.match(/Chrome\/([\d.]+)/) || ua.match(/CriOS\/([\d.]+)/), @@ -33,6 +34,7 @@ if (webos) os.webos = true, os.version = webos[2] if (touchpad) os.touchpad = true if (blackberry) os.blackberry = true, os.version = blackberry[2] + if (bb10) os.bb10 = true, os.version = bb10[2] if (rimtabletos) os.rimtabletos = true, os.version = rimtabletos[2] if (playbook) browser.playbook = true if (kindle) os.kindle = true, os.version = kindle[1] @@ -42,7 +44,7 @@ if (firefox) browser.firefox = true, browser.version = firefox[1] os.tablet = !!(ipad || playbook || (android && !ua.match(/Mobile/)) || (firefox && ua.match(/Tablet/))) - os.phone = !!(!os.tablet && (android || iphone || webos || blackberry || chrome || firefox)) + os.phone = !!(!os.tablet && (android || iphone || webos || blackberry || bb10 || chrome || firefox)) } detect.call($, navigator.userAgent) diff --git a/test/detect.html b/test/detect.html index 56a94f60f..11f0a9c7b 100644 --- a/test/detect.html +++ b/test/detect.html @@ -43,6 +43,7 @@

Browser detection

BlackBerry_6_0_0_141: "Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en-GB) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.141 Mobile Safari/534.1+", PlayBook_1_0_0: "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.8+ (KHTML, like Gecko) Version/0.0.1 Safari/534.8+", PlayBook_2_1_0: "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML, like Gecko) Version/7.2.1.0 Safari/536.2+", + BB10: "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.1+ (KHTML, like Gecko) Version/10.0.0.1337 Mobile Safari/537.1+", Opera_11_51: "Opera/9.80 (Macintosh; Intel Mac OS X 10.7.1; U; en) Presto/2.9.168 Version/11.51", Opera_Mobile_Simulator: "Opera/9.80 (Macintosh; Intel Mac OS X; Opera Mobi/[BUILD_NR]; U; en) Presto/2.7.81 Version/11.00", @@ -193,6 +194,12 @@

Browser detection

t.assertTrue(os.tablet) t.assertEqual("2.1.0", os.version) }) + detect(UA.BB10, function(os, browser){ + t.assertTrue(os.bb10) + t.assertTrue(browser.webkit) + t.assertTrue(os.phone) + t.assertEqual("10.0.0.1337", os.version) + }) }, testKindle: function(t) {