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

Merge pull request #90

This commit is contained in:
DIYgod 2017-06-25 14:18:33 +08:00
parent 767fd47b3d
commit e5bf4eca86
No known key found for this signature in database
GPG Key ID: EC0B76A252D3EF67
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "dplayer",
"version": "1.3.1",
"version": "1.3.2",
"description": "Wow, such a lovely HTML5 danmaku video player",
"main": "dist/DPlayer.min.js",
"style": "dist/DPlayer.min.css",

9
src/DPlayer.js
View File

@ -1,4 +1,4 @@
console.log('\n %c DPlayer 1.3.1 %c http://dplayer.js.org \n\n', 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #fadfa3; padding:5px 0;');
console.log('\n %c DPlayer 1.3.2 %c http://dplayer.js.org \n\n', 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #fadfa3; padding:5px 0;');
require('./DPlayer.scss');
const utils = require('./utils.js');
@ -1018,12 +1018,9 @@ class DPlayer {
* @param {Object} video - new video info
* @param {Object} danmaku - new danmaku info
*/
// TODO
switchVideo (video, danmaku) {
this.video.src = video.url;
this.video.poster = video.pic ? video.pic : '';
this.video.current.setAttribute('poster', this.video.poster);
this.video.current.setAttribute('src', this.video.src);
this.video.attr('poster', video.pic ? video.pic : '');
this.video.attr('src', video.url);
this.pause();
if (danmaku) {
this.dan = [];

1
src/video.js
View File

@ -89,7 +89,6 @@ class Video {
seek (time) {
time = Math.max(time, 0);
time = Math.min(time, this.duration);
console.log(time);
let i = 0;
let tmptime = 0;