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

fix NaN before canplay, close #94

This commit is contained in:
DIYgod 2016-12-21 18:48:02 +08:00
parent a0467709eb
commit c4c3ead825
No known key found for this signature in database
GPG Key ID: F8797DD1088C6506
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/APlayer.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

37
src/APlayer.js
View File

@ -69,6 +69,9 @@ class APlayer {
* @return {String} 00:00 format. 00:00:00 if over an hour long.
*/
this.secondToTime = (second) => {
if (isNaN(second)) {
return '00:00';
}
const add0 = (num) => {
return num < 10 ? '0' + num : '' + num;
};
@ -268,9 +271,14 @@ class APlayer {
const e = event || window.event;
barWidth = bar.barWrap.clientWidth;
const percentage = (e.clientX - getElementViewLeft(bar.barWrap)) / barWidth;
this.updateBar('played', percentage, 'width');
this.element.getElementsByClassName('aplayer-ptime')[0].innerHTML = this.secondToTime(percentage * this.audio.duration);
this.audio.currentTime = parseFloat(bar.playedBar.style.width) / 100 * this.audio.duration;
if (isNaN(this.audio.duration)) {
this.updateBar('played', 0, 'width');
}
else {
this.updateBar('played', percentage, 'width');
this.element.getElementsByClassName('aplayer-ptime')[0].innerHTML = this.secondToTime(percentage * this.audio.duration);
this.audio.currentTime = parseFloat(bar.playedBar.style.width) / 100 * this.audio.duration;
}
});
thumb.addEventListener('mouseover', () => {
@ -295,15 +303,20 @@ class APlayer {
const thumbUp = () => {
document.removeEventListener('mouseup', thumbUp);
document.removeEventListener('mousemove', thumbMove);
this.audio.currentTime = parseFloat(bar.playedBar.style.width) / 100 * this.audio.duration;
this.playedTime = setInterval(() => {
this.updateBar('played', this.audio.currentTime / this.audio.duration, 'width');
if (this.option.showlrc) {
this.updateLrc();
}
this.element.getElementsByClassName('aplayer-ptime')[0].innerHTML = this.secondToTime(this.audio.currentTime);
this.trigger('playing');
}, 100);
if (isNaN(this.audio.duration)) {
this.updateBar('played', 0, 'width');
}
else {
this.audio.currentTime = parseFloat(bar.playedBar.style.width) / 100 * this.audio.duration;
this.playedTime = setInterval(() => {
this.updateBar('played', this.audio.currentTime / this.audio.duration, 'width');
if (this.option.showlrc) {
this.updateLrc();
}
this.element.getElementsByClassName('aplayer-ptime')[0].innerHTML = this.secondToTime(this.audio.currentTime);
this.trigger('playing');
}, 100);
}
};
thumb.addEventListener('mousedown', () => {