From 8e8dd2007a87de8678a8a0134cad538abf6dabcd Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 14 Dec 2016 11:54:51 +0800 Subject: [PATCH 1/2] fix Android browser detection issue --- cocos2d/core/platform/CCSys.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index c5a22755b9..962dc26afd 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -586,13 +586,13 @@ 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; if (browserType === 'micromessenger') browserType = sys.BROWSER_TYPE_WECHAT; - else if (browserType === "safari" && (ua.match(/android.*applewebkit/))) + else if (ua.match(/android.*applewebkit/i)) browserType = sys.BROWSER_TYPE_ANDROID; else if (browserType === "trident") browserType = sys.BROWSER_TYPE_IE; From 1a5b2ffac743a0255700edfbecc859ad7d335347 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 14 Dec 2016 12:13:38 +0800 Subject: [PATCH 2/2] More secure browser type detection --- cocos2d/core/platform/CCSys.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index 962dc26afd..1d57b71ed4 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -589,11 +589,13 @@ else { 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 (ua.match(/android.*applewebkit/i)) - 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")