Skip to content

Commit c080a60

Browse files
committed
Fixed #3825: update the multiple audio white list
1 parent 4335942 commit c080a60

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

cocos2d/audio/SimpleAudioEngine.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,10 +1960,11 @@ cc.AudioEngine.getInstance = function () {
19601960
if (cc.Browser.supportWebAudio) {
19611961
this._instance = new cc.WebAudioEngine();
19621962
} else {
1963-
if (cc.Browser.multipleAudioWhiteList.indexOf(cc.Browser.type) == -1)
1963+
this._instance = new cc.SimpleAudioEngine();
1964+
/* if (cc.Browser.multipleAudioWhiteList.indexOf(cc.Browser.type) !== -1)
19641965
this._instance = new cc.SimpleAudioEngine();
19651966
else
1966-
this._instance = new cc.SimpleAudioEngineForMobile();
1967+
this._instance = new cc.SimpleAudioEngineForMobile();*/
19671968
}
19681969
this._instance.init();
19691970
}

cocos2d/core/platform/miniFramework.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,29 @@ cc.Browser.webglWhiteList = ["baidubrowser", "opera", "firefox", "chrome", "safa
6363
* Browsers that multiple audio support well
6464
* @type {Array}
6565
*/
66-
cc.Browser.multipleAudioWhiteList = ["baidubrowser", "opera", "firefox", "chrome", "safari"];
66+
cc.Browser.multipleAudioWhiteList = ["baidubrowser", "opera", "firefox", "chrome", "safari", "ucbrowser", "qqbrowser", "mqqbrowser"];
6767

6868
(function () {
6969
var ua = navigator.userAgent;
7070
cc.Browser.ua = ua.toLowerCase();
7171
cc.Browser.platform = navigator.platform.toLowerCase();
7272
cc.Browser.isMobile = (cc.Browser.ua.indexOf('mobile') != -1 || cc.Browser.ua.indexOf('android') != -1);
7373
cc.Browser.type = (function () {
74-
var browserTypes = cc.Browser.ua.match(/micromessenger|qqbrowser|mqqbrowser|ucbrowser|360browser|baidubrowser|maxthon|ie|opera|firefox/) || cc.Browser.ua.match(/chrome|safari/);
74+
alert(cc.Browser.ua);
75+
var browserTypes = cc.Browser.ua.match(/micromessenger|qqbrowser|mqqbrowser|ucbrowser|360browser|baiduboxapp|baidubrowser|maxthon|ie|opera|miuibrowser|firefox/)
76+
|| cc.Browser.ua.match(/chrome|safari/);
77+
7578
if (browserTypes && browserTypes.length > 0) {
7679
var el = browserTypes[0];
7780
if (el == 'micromessenger') {
7881
return 'wechat';
79-
}
82+
}else if( el === "safari" && (cc.Browser.ua.match(/android.*applewebkit/) != null))
83+
return "androidbrowser";
8084
return el;
8185
}
8286
return "unknow";
8387
})();
88+
alert(cc.Browser.type);
8489
cc.Browser.mode = cc.Browser.type == 'ie' && document.documentMode;
8590

8691
if (!document["ccConfig"])

0 commit comments

Comments
 (0)