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.

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

Update ua module and its test cases. #13

Merged
merged 1 commit into from
Dec 25, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
76 changes: 73 additions & 3 deletions src/ua.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void function (window, _ext) {
// detect by ua string
ua.str = navigator.userAgent

function __detect(ua) {
function _detect(ua) {
var s = ua.str.toLowerCase()

ua.isSafari = /\bapple\b/i.test(navigator.vendor) && /\bsafari\b/i.test(s)
Expand Down Expand Up @@ -50,6 +50,67 @@ void function (window, _ext) {
// summery
if (ua.isIOS || ua.isAndroid) ua.isMobileDevice = true

// get browser info
var browser = ''
if (_.str.include(s, 'micromessenger')) {
browser = 'wechat'
} else if (_.str.include(s, 'ucbrowser') || _.str.include(s, 'ucweb') || _.str.include(s, ' uc applewebkit')) {
browser = 'uc'
} else if (_.str.include(s, 'baiduhd') || _.str.include(s, 'baiduboxapp')) {
browser = 'baidu-app'
} else if (_.str.include(s, 'baidubrowser')) {
browser = 'baidu-browser'
} else if (_.str.include(s, 'mqqbrowser')) {
browser = 'mqq'
} else if (_.str.include(s, 'miuibrowser')) {
browser = 'miui'
} else if (_.str.include(s, '_weibo_') || _.str.include(s, ' weibo ')) {
browser = 'weibo'
} else if (_.str.include(s, 'firefox')) {
browser = 'firefox'
} else if (_.str.include(s, 'opera')) {
browser = 'opera'
} else if (ua.isChrome) {
browser = 'chrome'
if (ua.isAndroid && /\bwv\b/.test(s)) browser = 'chrome-webview'
} else if (ua.isSafari) {
browser = 'safari'
}

// fix - some browsers might be detected as Chrome or Safari
if (browser !== 'chrome') ua.isChrome = false
if (browser !== 'safari') ua.isSafari = false

// get engine info
var engine = ''
var engineVersion = ''
var testChrome = /chrome[^\d]*([\.\d]*)[ ;\/]/.exec(s)
if (testChrome) {
engine = 'chrome'
engineVersion = _trimVersion(testChrome[1])
} else {
var testWebKit = /webkit[^\d]*([\.\d]*)\+*[ ;\/]/.exec(s)
if (testWebKit) {
engine = 'webkit'
engineVersion = _trimVersion(testWebKit[1])
}
}
if (!engine) {
if (_.str.include(s, 'webkit')) {
engine = 'webkit'
} else if (ua.isIOS) {
engine = 'webkit'
} else if (ua.isAndroid && browser === 'mqq') {
engine = 'webkit'
}
if (browser === 'firefox' && !ua.isIOS) engine = 'gecko'
if (browser === 'opera' && !ua.isIOS && _.str.include(s, 'presto')) engine = 'presto'
}

// output
ua.browser = browser
ua.engine = engine
ua.engineVersion = engineVersion
return ua
}

Expand All @@ -60,12 +121,21 @@ void function (window, _ext) {
}
*/

// util
// TODO: implement a stricter API: `_.str.formatVersion(ver, length)`, e.g. ('1.2', 3) -> '1.2.0'
function _trimVersion(ver, length) {
var temp = ver.split('.')
temp.length = length || 2
return _.compact(temp).join('.')
}

// init
__detect(ua)
_detect(ua)

/** DEBUG_INFO_START **/
// exports for unit test
ua.__detect = __detect
ua.__detect = _detect
ua.__trimVersion = _trimVersion
/** DEBUG_INFO_END **/

// exports
Expand Down
Loading