Merge branch 'master' into master

This commit is contained in:
DIYgod 2017-07-28 12:33:20 +08:00 committed by GitHub
commit 09d0f43bff
4 changed files with 4 additions and 4 deletions

File diff suppressed because one or more lines are too long

2
dist/DPlayer.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -14,7 +14,7 @@ module.exports = (option) => {
theme: '#b7daff',
loop: false,
lang: navigator.language.indexOf('zh') !== -1 ? 'zh' : 'en',
screenshot: true,
screenshot: false,
hotkey: true,
preload: 'auto',
apiBackend: defaultApiBackend,