eplayer 1.6.4 → 1.6.7

package/docs/eplayer.js

@@ -6,6 +6,7 @@ class Eplayer extends HTMLElement {
     this.type = this.getAttribute('type')
     this.live = JSON.parse(this.getAttribute('live'))
     this.danmaku = null
+    this.subs = []
 
     this.init()
     this.stream()
@@ -82,10 +83,12 @@ class Eplayer extends HTMLElement {
       this.video.play()
       this.danmaku.resume()
       this.$('.is-play').setAttribute('icon-id', 'pause')
+      this.emit('play')
     } else {
       this.video.pause()
       this.danmaku.pause()
       this.$('.is-play').setAttribute('icon-id', 'play')
+      this.emit('pause')
     }
   }
 
@@ -140,11 +143,11 @@ class Eplayer extends HTMLElement {
   }
 
   alow() {
-    console.log(111)
     clearTimeout(this.timer)
     this.$('.mark').style.cursor = 'default'
+    this.$('.eplayer').classList.add('hover')
     this.timer = setTimeout(() => {
-      this.$('.controls').style.bottom = -34 + 'px'
+      this.$('.eplayer').classList.remove('hover')
       this.$('.mark').style.cursor = 'none'
     }, 5000)
   }
@@ -226,7 +229,7 @@ class Eplayer extends HTMLElement {
   }
 
   speed(e) {
-    this.video.playbackRate === 2 ? (this.video.playbackRate = 1) : (this.video.playbackRate = this.video.playbackRate + 0.5)
+    this.video.playbackRate === 3 ? (this.video.playbackRate = 1) : (this.video.playbackRate = this.video.playbackRate + 0.25)
     this.$('.speed').innerText = this.video.playbackRate + 'x'
   }
 
@@ -264,12 +267,9 @@ class Eplayer extends HTMLElement {
           bottom:-34px;
           z-index:1;   
         }
-          .eplayer:hover .controls{
+        .hover:hover .controls{
           bottom:0;
-          animation: hidden 0s ease-in 5s forwards;
-          animation-fill-mode: forwards;
-          transition: .3s ease-out;
-          }
+        }
         .progress{
           display:${this.live ? 'none' : 'block'};
           position:relative;
@@ -334,13 +334,6 @@ class Eplayer extends HTMLElement {
           transform: translate(50%,0);
           cursor:pointer;
           z-index:1;
-        }
-          @keyframes hidden {
-            to {
-                
-                transition: .3s ease-out;
-                bottom:-34px;
-            }
         }
         @keyframes loading{
           0%{
@@ -423,7 +416,7 @@ class Eplayer extends HTMLElement {
         
       </style>
       
-      <div class="eplayer">
+      <div class="eplayer hover">
       <div class="danmaku"></div>
         <video id="video" class="video" src="${this.src || ''}"></video>
         <div class="mark loading"></div>
@@ -451,7 +444,6 @@ class Eplayer extends HTMLElement {
             </div>
           </div>
         </div>
-        <iconpark-icon icon-id="play"></iconpark-icon>
         <div class="panel"></div>
       </div>
     `
@@ -490,16 +482,6 @@ class Eplayer extends HTMLElement {
       let dom = this.shadowRoot.querySelectorAll(key)
       this.doms[key] = dom.length > 1 ? [...dom] : dom[0]
     }
-
-
-    for (const name in Eplayer.plugins) {
-      const cb = Eplayer.plugins[name]
-      let node = document.createElement('li')
-      node.innerText = name
-      let panel = this.$('.panel')
-      panel.appendChild(node)
-      node.addEventListener('click', () => cb(this.shadowRoot))
-    }
   }
 
   connectedCallback() {
@@ -534,8 +516,7 @@ class Eplayer extends HTMLElement {
       },
     })
     this.delegate('keydown', this.keydown)
-    this.delegate('mouseleave', this.alow)
-    this.$('.eplayer').oncontextmenu = () => false
+    this.delegate('mousemove', this.alow)
   }
 
   delegate(type, map) {
@@ -557,14 +538,20 @@ class Eplayer extends HTMLElement {
     }
   }
 
+  emit (name) {
+    const fn = Eplayer.subs[name]
+    fn && fn.call(this, this.shadowRoot)
+  }
+
 }
 
-Eplayer.plugins = {}
+Eplayer.subs = {}
 
 Eplayer.use = function (name, cb) {
-  this.plugins[name] = cb
+  this.subs[name] = cb
 }
 
+
 function getTimeStr(time) {
   let h = Math.floor(time / 3600)
   let m = Math.floor((time % 3600) / 60)
@@ -585,8 +572,4 @@ function isFullScreen() {
   document.head.appendChild(link)
 })()
 
-Eplayer.use('github源码', (ep) => {
-  window.location.href = 'https://github.com/132yse/eplayer'
-})
-
 customElements.define('e-player', Eplayer)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eplayer",
-  "version": "1.6.4",
+  "version": "1.6.7",
   "description": "A web-components html5 video player facing future",
   "main": "./docs/eplayer.js",
   "module": "./docs/eplayer.js",