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

add Edge browser type && fix webAudio bug on Edge and Baidu browser #4910

Merged
merged 3 commits into from Jul 19, 2019

Conversation

@umbrellaPP
Copy link
Contributor

commented Jul 18, 2019

Re: cocos-creator/2d-tasks#128

changeLog:

  • 修复 Edge 和百度浏览器上不能播放音频的问题
  • 增加 Edge 浏览器类型的判断

Edge 的 userAgent 信息比较奇葩
BF660C45FBA205BCD97FA44B6E05B0A5

@umbrellaPP umbrellaPP changed the title add Edge browser type && fix webAudio bug on Edge browser add Edge browser type && fix webAudio bug on Edge and Baidu browser Jul 18, 2019
WebAudioElement.TIME_CONSTANT = 0.01;
}
else {
WebAudioElement.TIME_CONSTANT = 0;

This comment has been minimized.

Copy link
@jareguo

jareguo Jul 18, 2019

Contributor

这个变量作为一个局部常量就行了吧?

This comment has been minimized.

Copy link
@umbrellaPP

umbrellaPP Jul 19, 2019

Author Contributor

可以,我更新了

@umbrellaPP umbrellaPP force-pushed the umbrellaPP:2.1.3_audio branch from 2d2786e to 378cbf7 Jul 19, 2019
@jareguo jareguo merged commit b33b14f into cocos-creator:v2.1.3 Jul 19, 2019
1 check passed
1 check passed
ci/circleci: test Your tests passed on CircleCI!
Details
jareguo added a commit that referenced this pull request Jul 23, 2019
* commit '94e490299e0e5c860305ae3f0324a1bb5c222852':
  fixed api link error. (#4920)
  support alipay minigame (#4880)
  fixed api docs (#4918)
  add Edge browser type && fix webAudio bug on Edge and Baidu browser (#4910)
  remove warning when upgrading editBox compnent (#4916)
  refine code (#4900)
  fix scrollView bug for 2d-tasks/issues/1555 (#4894)

# Conflicts:
#	cocos2d/core/mesh/CCMesh.js
#	cocos2d/core/platform/CCSys.js
#	cocos2d/core/platform/CCView.js
#	cocos2d/videoplayer/video-player-impl.js
jareguo added a commit that referenced this pull request Jul 23, 2019
* v2.2.0:
  fixed api link error. (#4920)
  support alipay minigame (#4880)
  fixed api docs (#4918)
  add Edge browser type && fix webAudio bug on Edge and Baidu browser (#4910)
  remove warning when upgrading editBox compnent (#4916)
  move platform related code (#4913)
  fix warn after subContextView modules are excluded (#4737)
  refine code (#4900)
  fix scrollView bug for 2d-tasks/issues/1555 (#4894)

# Conflicts:
#	cocos2d/core/mesh/CCMesh.js
#	cocos2d/core/platform/CCSys.js
#	cocos2d/core/utils/profiler/CCProfiler.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.