From 6a3a61064dc69c52d14b2be5ff44ece67fc1ac14 Mon Sep 17 00:00:00 2001
From: k----n <kalvin@kalvineng.com>
Date: Fri, 4 Oct 2019 23:41:47 -0600
Subject: [PATCH 1/7] Autoplays if possible, otherwise plays after user clicks
 play

---
 css/styles.css    |  2 +-
 index.html        |  2 +-
 js/everything.js  |  9 ++++++++
 package-lock.json | 54 +++++++++++++++--------------------------------
 4 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/css/styles.css b/css/styles.css
index 9976030a..eecaa516 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -267,7 +267,7 @@ a {
 }
 
 .plyr__video-wrapper {
-    display: none;
+    display: block;
 }
 
 #audioplayer .plyr__controls {
diff --git a/index.html b/index.html
index 7a3b3aeb..b6f2cefd 100644
--- a/index.html
+++ b/index.html
@@ -68,7 +68,7 @@ <h3>
 
             <div id="playerControls">
                 <button class="btn" id="togglePlayer">
-                    Show Player
+                    Hide Player
                 </button>
                 <button class="btn" id="toggleDescription">
                     Show Description
diff --git a/js/everything.js b/js/everything.js
index 0eee5ad7..031e0840 100644
--- a/js/everything.js
+++ b/js/everything.js
@@ -89,6 +89,7 @@ var ZenPlayer = {
     updated: false,
     isPlaying: false,
     isRepeat: false,
+    autoplayBrowser: false,
 
     init: function(videoID) {
         // Inject svg with control icons
@@ -137,6 +138,7 @@ var ZenPlayer = {
                 that.setupTitle();
                 that.setupVideoDescription(videoID);
                 that.setupPlyrToggle();
+                that.show();
             });
 
             plyrPlayer.addEventListener("playing", function() {
@@ -208,6 +210,13 @@ var ZenPlayer = {
                 this.isPlaying = false;
             }.bind(this));
 
+            plyrPlayer.addEventListener("statechange", function() {
+                if (event.detail.code === 1 && this.autoplayBrowser === false) {
+                    $("#togglePlayer").click();
+                    this.autoplayBrowser = true;
+                }
+            }.bind(this));
+
             plyrPlayer.plyr.source({
                 type: "video",
                 title: "Title",
diff --git a/package-lock.json b/package-lock.json
index da6996e6..ca8e2d92 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1748,10 +1748,13 @@
       }
     },
     "eslint-utils": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
-      "dev": true
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
+      "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.0.0"
+      }
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
@@ -3995,9 +3998,9 @@
       }
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -5607,9 +5610,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -7240,38 +7243,15 @@
       }
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "uniq": {

From 1327b5e956c4c64ec753422d433f693b60df48de Mon Sep 17 00:00:00 2001
From: k----n <kalvin@kalvineng.com>
Date: Sat, 5 Oct 2019 00:18:38 -0600
Subject: [PATCH 2/7] Fix repeat

---
 js/everything.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/js/everything.js b/js/everything.js
index 031e0840..112df16f 100644
--- a/js/everything.js
+++ b/js/everything.js
@@ -199,6 +199,11 @@ var ZenPlayer = {
                 else if (resumeTime <= 0 && $("#zen-video-title").attr("href") !== that.videoUrl) {
                     updatedUrl = that.videoUrl;
                 }
+                else if (resumeTime <= 0 && $("#zen-video-title").attr("href") === that.videoUrl && that.isRepeat) {
+                    resumeTime = 0;
+                    plyrPlayer.plyr.embed.seekTo(resumeTime);
+                    ZenPlayer.play();
+                }
                 $("#zen-video-title").attr("href", updatedUrl);
             });
 

From 7f088c7ec86512880ff4fc11f7918762cb694728 Mon Sep 17 00:00:00 2001
From: k----n <kalvin@kalvineng.com>
Date: Sat, 5 Oct 2019 00:32:05 -0600
Subject: [PATCH 3/7] Reverted code to not include autoplay fix in order to
 pass tests

---
 css/styles.css   | 2 +-
 index.html       | 2 +-
 js/everything.js | 8 --------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/css/styles.css b/css/styles.css
index eecaa516..9976030a 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -267,7 +267,7 @@ a {
 }
 
 .plyr__video-wrapper {
-    display: block;
+    display: none;
 }
 
 #audioplayer .plyr__controls {
diff --git a/index.html b/index.html
index b6f2cefd..7a3b3aeb 100644
--- a/index.html
+++ b/index.html
@@ -68,7 +68,7 @@ <h3>
 
             <div id="playerControls">
                 <button class="btn" id="togglePlayer">
-                    Hide Player
+                    Show Player
                 </button>
                 <button class="btn" id="toggleDescription">
                     Show Description
diff --git a/js/everything.js b/js/everything.js
index 112df16f..51181c1b 100644
--- a/js/everything.js
+++ b/js/everything.js
@@ -89,7 +89,6 @@ var ZenPlayer = {
     updated: false,
     isPlaying: false,
     isRepeat: false,
-    autoplayBrowser: false,
 
     init: function(videoID) {
         // Inject svg with control icons
@@ -215,13 +214,6 @@ var ZenPlayer = {
                 this.isPlaying = false;
             }.bind(this));
 
-            plyrPlayer.addEventListener("statechange", function() {
-                if (event.detail.code === 1 && this.autoplayBrowser === false) {
-                    $("#togglePlayer").click();
-                    this.autoplayBrowser = true;
-                }
-            }.bind(this));
-
             plyrPlayer.plyr.source({
                 type: "video",
                 title: "Title",

From 24ce7f51c7db3b2ac0c1bfd07459194f3e43e61a Mon Sep 17 00:00:00 2001
From: k----n <kalvin@kalvineng.com>
Date: Mon, 7 Oct 2019 20:24:56 -0600
Subject: [PATCH 4/7] Revert changes as per
 https://github.com/zen-audio-player/zen-audio-player.github.io/pull/328#discussion_r332254182

---
 js/everything.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/everything.js b/js/everything.js
index 51181c1b..3aa4e3c8 100644
--- a/js/everything.js
+++ b/js/everything.js
@@ -137,7 +137,6 @@ var ZenPlayer = {
                 that.setupTitle();
                 that.setupVideoDescription(videoID);
                 that.setupPlyrToggle();
-                that.show();
             });
 
             plyrPlayer.addEventListener("playing", function() {

From 66eadfb7eb443b2ddf3bf38aafa3723a6a4e9622 Mon Sep 17 00:00:00 2001
From: k----n <kalvin@kalvineng.com>
Date: Fri, 25 Oct 2019 19:51:49 -0600
Subject: [PATCH 5/7] Added event listener for ended, and to repeat

---
 js/everything.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/js/everything.js b/js/everything.js
index 3aa4e3c8..c7b50353 100644
--- a/js/everything.js
+++ b/js/everything.js
@@ -165,6 +165,12 @@ var ZenPlayer = {
                 updateTweetMessage();
             });
 
+            plyrPlayer.addEventListener("ended", function() {
+                if (that.isRepeat) {
+                    plyrPlayer.plyr.play();
+                }
+            });
+
             plyrPlayer.addEventListener("timeupdate", function() {
                 // Store the current time of the video.
                 var resumeTime = 0;
@@ -185,7 +191,7 @@ var ZenPlayer = {
                     if (currentTime >= videoDuration && that.isRepeat) {
                         resumeTime = 0;
                         plyrPlayer.plyr.embed.seekTo(resumeTime);
-                        ZenPlayer.play();
+                        plyrPlayer.plyr.play();
                     }
                     window.sessionStorage[videoID] = resumeTime;
                 }
@@ -200,7 +206,7 @@ var ZenPlayer = {
                 else if (resumeTime <= 0 && $("#zen-video-title").attr("href") === that.videoUrl && that.isRepeat) {
                     resumeTime = 0;
                     plyrPlayer.plyr.embed.seekTo(resumeTime);
-                    ZenPlayer.play();
+                    plyrPlayer.plyr.play();
                 }
                 $("#zen-video-title").attr("href", updatedUrl);
             });

From 601d696fb412ca93a99a8b353acb5a431e4642d4 Mon Sep 17 00:00:00 2001
From: k----n <kalvin@kalvineng.com>
Date: Fri, 25 Oct 2019 19:56:03 -0600
Subject: [PATCH 6/7] Fixed merge conflict

---
 package-lock.json | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index adef6af6..60b53ef9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1748,14 +1748,6 @@
       }
     },
     "eslint-utils": {
-<<<<<<< HEAD
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
-      "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^1.0.0"
-=======
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
       "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
@@ -1770,7 +1762,6 @@
           "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
           "dev": true
         }
->>>>>>> upstream/master
       }
     },
     "eslint-visitor-keys": {
@@ -2313,7 +2304,7 @@
       "dependencies": {
         "combined-stream": {
           "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+          "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
           "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
           "dev": true,
           "requires": {
@@ -2911,9 +2902,9 @@
       }
     },
     "https-proxy-agent": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz",
-      "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
       "dev": true,
       "requires": {
         "agent-base": "^4.3.0",
@@ -4785,7 +4776,7 @@
       "dependencies": {
         "async": {
           "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz",
           "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
         }
       }
@@ -7625,7 +7616,7 @@
       "dependencies": {
         "async": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "resolved": "http://registry.npmjs.org/async/-/async-1.0.0.tgz",
           "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
           "dev": true,
           "optional": true

From 5735ced35e0a17c3c9ce3785cb6c14a5f8dab691 Mon Sep 17 00:00:00 2001
From: k----n <kalvin@kalvineng.com>
Date: Fri, 25 Oct 2019 20:02:33 -0600
Subject: [PATCH 7/7] Using new loop boolean

---
 js/everything.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/everything.js b/js/everything.js
index c7b50353..5557264b 100644
--- a/js/everything.js
+++ b/js/everything.js
@@ -655,6 +655,7 @@ $(function() {
             $(this).html("Repeat Track");
         }
         ZenPlayer.isRepeat = $(this).hasClass("toggleRepeatActive");
+        document.querySelector(".plyr").plyr.loop = !document.querySelector(".plyr").plyr.loop;
     });
 
     // Handle demo link click