Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds detect support for mobile Chrome browser #596

Merged
merged 1 commit into from
Sep 25, 2012
Merged

Adds detect support for mobile Chrome browser #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Adds detect support for mobile Chrome browser 
Adds browser sniffing for chrome on both Android and iOS (different ua strings - https://developers.google.com/chrome/mobile/docs/user-agent)
  • Loading branch information
@elgerlambert
elgerlambert committed Sep 24, 2012
commit c7c227799984be5c21391475a2e69afa4307445b
4 changes: 3 additions & 1 deletion src/detect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
touchpad = webos && ua.match(/TouchPad/),
kindle = ua.match(/Kindle\/([\d.]+)/),
silk = ua.match(/Silk\/([\d._]+)/),
blackberry = ua.match(/(BlackBerry).*Version\/([\d.]+)/)
blackberry = ua.match(/(BlackBerry).*Version\/([\d.]+)/),
chrome = ua.match(/Chrome\/([\d.]+)/) || ua.match(/CriOS\/([\d.]+)/)

// todo clean this up with a better OS/browser
// separation. we need to discern between multiple
Expand All @@ -31,6 +32,7 @@
if (kindle) os.kindle = true, os.version = kindle[1]
if (silk) browser.silk = true, browser.version = silk[1]
if (!silk && os.android && ua.match(/Kindle Fire/)) browser.silk = true
if (chrome) browser.chrome = true, browser.version = chrome[1]
}

detect.call($, navigator.userAgent)
Expand Down
21 changes: 20 additions & 1 deletion test/detect.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ <h1>Browser detection</h1>

Kindle: "Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) Version/4.0 Kindle/3.0 (screen 600×800; rotate)",
Silk_1_0_accel: "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.0.13.328_10008910) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16 Silk-Accelerated=true",
Silk_1_0: "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
Silk_1_0: "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",

Chrome_Android_18_0: "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19",
Chrome_iOS_19_0: "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3"
}

function detect(ua, callback){
Expand Down Expand Up @@ -179,6 +182,22 @@ <h1>Browser detection</h1>
t.assertFalse(browser.webkit)
t.assertUndefined(browser.version)
})
},

testChrome: function(t) {
detect(UA.Chrome_Android_18_0, function(os, browser){
t.assertTrue(os.android)
t.assertTrue(browser.webkit)
t.assertTrue(browser.chrome)
t.assertEqual("18.0.1025.133", browser.version)
})

detect(UA.Chrome_iOS_19_0, function(os, browser){
t.assertTrue(os.ios)
t.assertTrue(browser.webkit)
t.assertTrue(browser.chrome)
t.assertEqual("19.0.1084.60", browser.version)
})
}
})
})()
Expand Down