Browse Source

New api: switchQuality

DIYgod 8 years ago
parent
commit
a4f5c2c0f3
5 changed files with 7 additions and 4 deletions
  1. 2 0
      demo/index.html
  2. 0 0
      dist/DPlayer.min.js
  3. 0 0
      dist/DPlayer.min.js.map
  4. 1 1
      package.json
  5. 4 3
      src/DPlayer.js

+ 2 - 0
demo/index.html

@@ -54,8 +54,10 @@
     <h3>Normal</h3>
     <div id="dplayer1"></div>
     <button onclick="switchDPlayer()">Switch Video</button>
+    <button onclick="dp1.notice('Notice演示')">Notice</button>
     <h3>Quality switching</h3>
     <div id="dplayer6"></div>
+    <button onclick="dp6.switchQuality(1)">Switch quality</button>
     <h3>Live Video (HTTP Live Streaming, M3U8 format) support</h3>
     <div id="dplayer3"></div>
     <h3>FLV format support</h3>

File diff suppressed because it is too large
+ 0 - 0
dist/DPlayer.min.js


File diff suppressed because it is too large
+ 0 - 0
dist/DPlayer.min.js.map


+ 1 - 1
package.json

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

+ 4 - 3
src/DPlayer.js

@@ -1,4 +1,4 @@
-console.log('\n %c DPlayer 1.3.0 %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.1 %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');
@@ -756,7 +756,6 @@ class DPlayer {
             this.element.getElementsByClassName('dplayer-quality-list')[0].addEventListener('click', (e) => {
                 if (e.target.classList.contains('dplayer-quality-item')) {
                     this.switchQuality(e.target.dataset.index);
-                    this.element.getElementsByClassName('dplayer-quality-icon')[0].innerHTML = this.option.video.quality[this.qualityIndex].name;
                 }
             });
         }
@@ -1169,8 +1168,10 @@ class DPlayer {
             this.qualityIndex = index;
         }
         this.switchingQuality = true;
-        this.video.pause();
         this.quality = this.option.video.quality[index];
+        this.element.getElementsByClassName('dplayer-quality-icon')[0].innerHTML = this.quality.name;
+    
+        this.video.pause();
         const videoHTML = html.video(false, null, this.option.screenshot, 'auto', this.quality.url);
         const videoEle = new DOMParser().parseFromString(videoHTML, 'text/html').body.firstChild;
         const parent = this.element.getElementsByClassName('dplayer-video-wrap')[0];

Some files were not shown because too many files changed in this diff