fix destroy

DIYgod · DIYgod · commit fc1a04b303b6 · 2018-03-09T16:21:24.000+08:00
diff --git a/src/js/player.js b/src/js/player.js
@@ -446,12 +446,8 @@ class APlayer {
         instances.splice(instances.indexOf(this), 1);
         this.pause();
         this.container.innerHTML = '';
-        clearInterval(this.playedTime);
-        for (const key in this) {
-            if (this.hasOwnProperty(key)) {
-                delete this[key];
-            }
-        }
+        this.audio.src = '';
+        this.timer.destroy();
     }
 
     handlePlayPromise (callback) {
diff --git a/src/js/timer.js b/src/js/timer.js
@@ -21,12 +21,10 @@ class Timer {
     }
 
     init () {
-        for (let i = 0; i < this.types.length; i++) {
-            const type = this.types[i];
-            if (type !== 'fps') {
-                this[`init${type}Checker`]();
-            }
-        }
+        this.types.map((item) => {
+            this[`init${item}Checker`]();
+            return item;
+        });
     }
 
     initprogressChecker () {
@@ -79,8 +77,12 @@ class Timer {
         this[`enable${type}Checker`] = false;
     }
 
-    destroy (type) {
-        this[`${type}Checker`] && clearInterval(this[`${type}Checker`]);
+    destroy () {
+        this.types.map((item) => {
+            this[`enable${item}Checker`] = false;
+            this[`${item}Checker`] && clearInterval(this[`${item}Checker`]);
+            return item;
+        });
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,10 @@ class Timer {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`init () {`
`24`		`- for (let i = 0; i < this.types.length; i++) {`
`25`		`- const type = this.types[i];`
`26`		`- if (type !== 'fps') {`
`27`		- this[`init${type}Checker`]();
`28`		`- }`
`29`		`- }`
	`24`	`+ this.types.map((item) => {`
	`25`	+ this[`init${item}Checker`]();
	`26`	`+ return item;`
	`27`	`+ });`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`initprogressChecker () {`
`@@ -79,8 +77,12 @@ class Timer {`
`79`	`77`	this[`enable${type}Checker`] = false;
`80`	`78`	`}`
`81`	`79`
`82`		`- destroy (type) {`
`83`		- this[`${type}Checker`] && clearInterval(this[`${type}Checker`]);
	`80`	`+ destroy () {`
	`81`	`+ this.types.map((item) => {`
	`82`	+ this[`enable${item}Checker`] = false;
	`83`	+ this[`${item}Checker`] && clearInterval(this[`${item}Checker`]);
	`84`	`+ return item;`
	`85`	`+ });`
`84`	`86`	`}`
`85`	`87`	`}`
`86`	`88`