fix: fix destroy api

fix destroy is called,error will be triggerd
bytedance · Aug 3, 2018 · bc3c4f2 · bc3c4f2
1 parent c27b5d9
commit bc3c4f2
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 9 deletions.
diff --git a/packages/xgplayer-hls/browser/index.js b/packages/xgplayer-hls/browser/index.js
diff --git a/packages/xgplayer-hls/dist/index.js b/packages/xgplayer-hls/dist/index.js
diff --git a/packages/xgplayer-mp4/browser/index.js b/packages/xgplayer-mp4/browser/index.js
diff --git a/packages/xgplayer-mp4/dist/index.js b/packages/xgplayer-mp4/dist/index.js
diff --git a/packages/xgplayer-mp4/src/index.js b/packages/xgplayer-mp4/src/index.js
@@ -242,6 +242,13 @@ let mp4player = function () {
  }
  })
 
+ player.once('destroy', () => {
+ Task.clear()
+ if (player.timer) {
+ clearTimeout(player.timer)
+ }
+ })
+
  player._replay = function () {
  Task.clear()
  player.mp4.bufferCache.clear()

diff --git a/packages/xgplayer/browser/index.js b/packages/xgplayer/browser/index.js
diff --git a/packages/xgplayer/dist/index.js b/packages/xgplayer/dist/index.js
diff --git a/packages/xgplayer/src/player.js b/packages/xgplayer/src/player.js
@@ -111,25 +111,38 @@ class Player extends Proxy {
 
  destroy () {
  let parentNode = this.root.parentNode
+ this.ev.forEach((item) => {
+ let evName = Object.keys(item)[0]
+ let evFunc = this[item[evName]]
+ if (evFunc) {
+ this.off(evName, evFunc)
+ }
+ });
+ ['focus', 'blur'].forEach(item => {
+ this.off(item, this['on' + item.charAt(0).toUpperCase() + item.slice(1)])
+ })
  if (!this.paused) {
  this.pause()
  this.once('pause', () => {
  this.emit('destroy')
  parentNode.removeChild(this.root)
  parentNode.appendChild(this.rootBackup)
+ for (let k in this) {
+ if (k !== 'config') {
+ delete this[k]
+ }
+ }
  })
  } else {
  this.emit('destroy')
  parentNode.removeChild(this.root)
  parentNode.appendChild(this.rootBackup)
- }
- setTimeout(function () {
  for (let k in this) {
  if (k !== 'config') {
  delete this[k]
  }
  }
- }, 200)
+ }
  }
 
  replay () {