xiaoxue_admin
/
DPlayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #533 from Copay/master 

Fix #531
This commit is contained in:
DIYgod 2019-09-23 19:00:29 +08:00 committed by GitHub
parent 8ddca4e84b 2443cc177f
commit 3eea68f2c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc
View File

@ -1,7 +1,7 @@
{
"extends": "eslint:recommended",
"parserOptions": {
"ecmaVersion": 6,
"ecmaVersion": 10,
"sourceType": "module"
},
"env": {

4
dist/DPlayer.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/DPlayer.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/DPlayer.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/DPlayer.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

9
src/js/player.js
View File

@ -33,7 +33,7 @@ class DPlayer {
* @constructor
*/
constructor (options) {
this.options = handleOption(options);
this.options = handleOption({preload:options.video.type === 'webtorrent' ? 'none' : 'metadata', ...options});
if (this.options.video.quality) {
this.qualityIndex = this.options.video.defaultQuality;
@ -404,12 +404,13 @@ class DPlayer {
this.container.classList.add('dplayer-loading');
const client = new WebTorrent();
const torrentId = video.src;
video.src = '';
video.preload = 'metadata';
video.addEventListener('durationchange', () => this.container.classList.remove('dplayer-loading'), {once: true});
client.add(torrentId, (torrent) => {
const file = torrent.files.find((file) => file.name.endsWith('.mp4'));
file.renderTo(this.video, {
autoplay: this.options.autoplay
}, () => {
this.container.classList.remove('dplayer-loading');
});
});
this.events.on('destroy', () => {
@ -455,7 +456,7 @@ class DPlayer {
// Not a video load error, may be poster load failed, see #307
return;
}
this.tran && this.notice && this.type !== 'webtorrent' & this.notice(this.tran('Video load failed'), -1);
this.tran && this.notice && this.type !== 'webtorrent' && this.notice(this.tran('Video load failed'), -1);
});
// video end

2
src/js/subtitle.js
View File

@ -22,7 +22,7 @@ class Subtitle {
if (cue) {
const template = document.createElement('div');
template.appendChild(cue.getCueAsHTML());
const trackHtml = template.innerHTML.split(/\r?\n/).map(item => `<p>${item}</p>`).join('');
const trackHtml = template.innerHTML.split(/\r?\n/).map((item) => `<p>${item}</p>`).join('');
this.container.innerHTML = trackHtml;
}
this.events.trigger('subtitle_change');