From 62c263bda32434df26b5e63fc646cfe294c98449 Mon Sep 17 00:00:00 2001
From: Albin Larsson <mail@albinlarsson.com>
Date: Mon, 11 Jun 2018 04:22:40 +0200
Subject: Replace quality setter conditions with Array.find()

---
 src/js/plyr.js | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

(limited to 'src/js/plyr.js')

diff --git a/src/js/plyr.js b/src/js/plyr.js
index 181eff9e..e2fce1fe 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -669,36 +669,28 @@ class Plyr {
      * @param {number} input - Quality level
      */
     set quality(input) {
-        let quality = null;
+        const config = this.config.quality;
+        const options = this.options.quality;
 
-        if (!utils.is.empty(input)) {
-            quality = Number(input);
-        }
-
-        if (!utils.is.number(quality)) {
-            quality = this.storage.get('quality');
-        }
-
-        if (!utils.is.number(quality)) {
-            quality = this.config.quality.selected;
-        }
-
-        if (!utils.is.number(quality)) {
-            quality = this.config.quality.default;
-        }
-
-        if (!this.options.quality.length) {
+        if (!options.length) {
             return;
         }
 
-        if (!this.options.quality.includes(quality)) {
-            const closest = utils.closest(this.options.quality, quality);
+        let quality = ([
+            !utils.is.empty(input) && Number(input),
+            this.storage.get('quality'),
+            config.selected,
+            config.default,
+        ]).find(utils.is.number);
+
+        if (!options.includes(quality)) {
+            const closest = utils.closest(options, quality);
             this.debug.warn(`Unsupported quality option: ${quality}, using ${closest} instead`);
             quality = closest;
         }
 
         // Update config
-        this.config.quality.selected = quality;
+        config.selected = quality;
 
         // Set quality
         this.media.quality = quality;
-- 
cgit v1.2.3


From 6d2dad58108d4c57e573a70872136c8dbb635d74 Mon Sep 17 00:00:00 2001
From: Albin Larsson <mail@albinlarsson.com>
Date: Mon, 11 Jun 2018 20:41:53 +0200
Subject: Trigger qualityrequested event unconditionally when trying to set it
 (needed for streaming libraries to be able to listen)

---
 src/js/plyr.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/js/plyr.js')

diff --git a/src/js/plyr.js b/src/js/plyr.js
index e2fce1fe..46fed3b2 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -689,6 +689,9 @@ class Plyr {
             quality = closest;
         }
 
+        // Trigger request event
+        utils.dispatchEvent.call(this, this.media, 'qualityrequested', false, { quality });
+
         // Update config
         config.selected = quality;
 
-- 
cgit v1.2.3


From 87170ab46080ae0d82afd1b39ab3fdf2e3ff1e62 Mon Sep 17 00:00:00 2001
From: cky <576779975@qq.com>
Date: Tue, 12 Jun 2018 20:55:31 +0800
Subject: remove event listeners in destroy, add once method

---
 src/js/plyr.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/js/plyr.js')

diff --git a/src/js/plyr.js b/src/js/plyr.js
index 71ca363e..2d2267da 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -245,6 +245,8 @@ class Plyr {
             return;
         }
 
+        this.eventListeners = [];
+
         // Create listeners
         this.listeners = new Listeners(this);
 
@@ -271,7 +273,7 @@ class Plyr {
 
         // Listen for events if debugging
         if (this.config.debug) {
-            utils.on(this.elements.container, this.config.events.join(' '), event => {
+            utils.on.call(this, this.elements.container, this.config.events.join(' '), event => {
                 this.debug.log(`event: ${event.type}`);
             });
         }
@@ -961,9 +963,16 @@ class Plyr {
      * @param {function} callback - Callback for when event occurs
      */
     on(event, callback) {
-        utils.on(this.elements.container, event, callback);
+        utils.on.call(this, this.elements.container, event, callback);
+    }
+    /**
+     * Add event listeners once
+     * @param {string} event - Event type
+     * @param {function} callback - Callback for when event occurs
+     */
+    once(event, callback) {
+        utils.once(this.elements.container, event, callback);
     }
-
     /**
      * Remove event listeners
      * @param {string} event - Event type
@@ -1014,8 +1023,7 @@ class Plyr {
                 }
             } else {
                 // Unbind listeners
-                this.listeners.clear();
-
+                utils.cleanupEventListeners.call(this);
                 // Replace the container with the original element provided
                 utils.replaceElement(this.elements.original, this.elements.container);
 
-- 
cgit v1.2.3