mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
Merge pull request #1361 from pandamicro/master
fix Android browser detection issue
This commit is contained in:
@@ -586,14 +586,16 @@ else {
|
||||
/* Determine the browser type */
|
||||
(function(){
|
||||
var typeReg1 = /mqqbrowser|sogou|qzone|liebao|micromessenger|ucbrowser|360 aphone|360browser|baiduboxapp|baidubrowser|maxthon|mxbrowser|trident|miuibrowser/i;
|
||||
var typeReg2 = /qqbrowser|chrome|safari|firefox|opr|oupeng|opera/i;
|
||||
var typeReg2 = /qqbrowser|qq|chrome|safari|firefox|opr|oupeng|opera/i;
|
||||
var browserTypes = typeReg1.exec(ua);
|
||||
if(!browserTypes) browserTypes = typeReg2.exec(ua);
|
||||
var browserType = browserTypes ? browserTypes[0] : sys.BROWSER_TYPE_UNKNOWN;
|
||||
var browserType = browserTypes ? browserTypes[0].toLowerCase() : sys.BROWSER_TYPE_UNKNOWN;
|
||||
if (browserType === 'micromessenger')
|
||||
browserType = sys.BROWSER_TYPE_WECHAT;
|
||||
else if (browserType === "safari" && (ua.match(/android.*applewebkit/)))
|
||||
browserType = sys.BROWSER_TYPE_ANDROID;
|
||||
else if (browserType === "safari" || browserType === "qq") {
|
||||
if (ua.match(/android.*applewebkit/i))
|
||||
browserType = sys.BROWSER_TYPE_ANDROID;
|
||||
}
|
||||
else if (browserType === "trident")
|
||||
browserType = sys.BROWSER_TYPE_IE;
|
||||
else if (browserType === "360 aphone")
|
||||
|
||||
Reference in New Issue
Block a user