From 4126c176666f4baa2f835cf57aed343ba5e6a4e4 Mon Sep 17 00:00:00 2001 From: quoije Date: Mon, 15 Aug 2022 02:43:01 -0400 Subject: [PATCH 1/4] fix cookie? --- assets/js/site.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/js/site.js b/assets/js/site.js index cba80ef..d6168b3 100644 --- a/assets/js/site.js +++ b/assets/js/site.js @@ -67,7 +67,7 @@ jQuery(function($) { audio.addEventListener('timeupdate',function(){ var currentTime = audio.currentTime; - Cookies.set("lastep-time", currentTime); + Cookies.set("lastep-time", currentTime, { expires: 365 }); },false); }); @@ -87,9 +87,9 @@ jQuery(function($) { document.getElementById("player").setAttribute('src', linkdec); document.getElementById("player").load(); document.getElementById("player").play(); - Cookies.set("lastep-title", title) - Cookies.set("lastep-src", audio.src); - Cookies.set("lastep-body", body) + Cookies.set("lastep-title", title, { expires: 365 }) + Cookies.set("lastep-src", audio.src, { expires: 365 }); + Cookies.set("lastep-body", body, { expires: 365 }) } From c66bee62aa86c3729b48cf5c4238ff3e04ddc96a Mon Sep 17 00:00:00 2001 From: quoije Date: Mon, 22 Aug 2022 02:36:37 -0400 Subject: [PATCH 2/4] player can save time after win close --- assets/css/oof.css | 11 +++++++ assets/js/site.js | 75 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/assets/css/oof.css b/assets/css/oof.css index 3bc7b22..7be4052 100644 --- a/assets/css/oof.css +++ b/assets/css/oof.css @@ -60,6 +60,17 @@ body { font-style: normal; } +<<<<<<< HEAD:assets/css/oof.css +======= +#audioplayerdivstop { + margin-bottom: 160px; +} + +#playicon { + margin-bottom: 2px; +} + +>>>>>>> ee5d4c2 (player can save time after win close):public/assets/css/oof.css #ws:link { text-decoration: none; color: inherit; diff --git a/assets/js/site.js b/assets/js/site.js index d6168b3..473c227 100644 --- a/assets/js/site.js +++ b/assets/js/site.js @@ -49,9 +49,27 @@ jQuery(function($) { 'top': $("#playerwindow").data('origionalTop') }); topFunction(); - document.getElementById("player").pause(); }); +<<<<<<< HEAD:assets/js/site.js +======= + $(".closewin").click(function() { + $("#playerwindow").css({ + 'left': $("#playerwindow").data('originalLeft'), + 'top': $("#playerwindow").data('origionalTop') + }); + topFunction(); + document.getElementById("sbody").innerHTML= ""; + document.getElementById("player").pause(); + keeplastepcache(); + document.getElementById("player").setAttribute('src', ""); + document.getElementById("lienep").href = ""; + document.getElementById("nomep").innerHTML = "Pas d'épisode en cours"; + document.getElementById("epstab").innerHTML = "épisodes"; + clearcache(); + }); + +>>>>>>> ee5d4c2 (player can save time after win close):public/assets/js/site.js var audio = document.getElementById('player'); console.log(audio.src); @@ -71,8 +89,52 @@ jQuery(function($) { },false); }); +<<<<<<< HEAD:assets/js/site.js // player things +======= + function checkepcache(){ + if (Cookies.get("lastep-src")){ + console.log("yahh"); + const epstab = document.getElementById("epstab"); + playicon(); + }; + } + + function keeplastepcache(){ + Cookies.set("lastep_b4close-title", document.getElementById("lienep").innerHTML, { expires: 365 }); + Cookies.set("lastep_b4close-time", document.getElementById("player").currentTime, { expires: 365 }); + } + + function clearcache(){ + Cookies.remove("lastep-title"); + Cookies.remove("lastep-body"); + Cookies.remove("lastep-src"); + Cookies.remove("lastep-time"); + } + + // player things + + function playicon(){ + const epstab = document.getElementById("epstab"); + if (document.getElementById("lienep").src = "") + { + epstab.innerHTML = "épisodes"; + } + else { + console.log("ayyyy"); + epstab.innerHTML = "" + " épisodes"; + } + + } + + function stopplayer(){ + document.getElementById("lienep").innerHTML= title; + document.getElementById("sbody").innerHTML= body + "...."; + document.getElementById("lienep").href= linkdec; + } + +>>>>>>> ee5d4c2 (player can save time after win close):public/assets/js/site.js function play(src, title, date, body) { var audio = document.getElementById('player'); console.log(src); @@ -83,11 +145,22 @@ jQuery(function($) { document.getElementById("lienep").innerHTML= title; document.getElementById("sbody").innerHTML= body + "...."; document.getElementById("lienep").href= linkdec; +<<<<<<< HEAD:assets/js/site.js document.getElementById("player").pause(); document.getElementById("player").setAttribute('src', linkdec); document.getElementById("player").load(); document.getElementById("player").play(); Cookies.set("lastep-title", title, { expires: 365 }) +======= + audio.pause(); + audio.setAttribute('src', linkdec); + if (title == Cookies.get("lastep_b4close-title")){ + audio.currentTime = Cookies.get("lastep_b4close-time"); + } + audio.load(); + audio.play(); + Cookies.set("lastep-title", title, { expires: 365 }); +>>>>>>> ee5d4c2 (player can save time after win close):public/assets/js/site.js Cookies.set("lastep-src", audio.src, { expires: 365 }); Cookies.set("lastep-body", body, { expires: 365 }) } From efa6311c6eed91e62ac6a671394299595653f265 Mon Sep 17 00:00:00 2001 From: quoije Date: Mon, 22 Aug 2022 02:39:54 -0400 Subject: [PATCH 3/4] fix cherrypick error --- assets/css/oof.css | 3 --- assets/js/site.js | 9 --------- 2 files changed, 12 deletions(-) diff --git a/assets/css/oof.css b/assets/css/oof.css index 7be4052..70edfb2 100644 --- a/assets/css/oof.css +++ b/assets/css/oof.css @@ -60,8 +60,6 @@ body { font-style: normal; } -<<<<<<< HEAD:assets/css/oof.css -======= #audioplayerdivstop { margin-bottom: 160px; } @@ -70,7 +68,6 @@ body { margin-bottom: 2px; } ->>>>>>> ee5d4c2 (player can save time after win close):public/assets/css/oof.css #ws:link { text-decoration: none; color: inherit; diff --git a/assets/js/site.js b/assets/js/site.js index 473c227..eaf8b2f 100644 --- a/assets/js/site.js +++ b/assets/js/site.js @@ -51,8 +51,6 @@ jQuery(function($) { topFunction(); }); -<<<<<<< HEAD:assets/js/site.js -======= $(".closewin").click(function() { $("#playerwindow").css({ 'left': $("#playerwindow").data('originalLeft'), @@ -69,7 +67,6 @@ jQuery(function($) { clearcache(); }); ->>>>>>> ee5d4c2 (player can save time after win close):public/assets/js/site.js var audio = document.getElementById('player'); console.log(audio.src); @@ -89,10 +86,8 @@ jQuery(function($) { },false); }); -<<<<<<< HEAD:assets/js/site.js // player things -======= function checkepcache(){ if (Cookies.get("lastep-src")){ console.log("yahh"); @@ -134,7 +129,6 @@ jQuery(function($) { document.getElementById("lienep").href= linkdec; } ->>>>>>> ee5d4c2 (player can save time after win close):public/assets/js/site.js function play(src, title, date, body) { var audio = document.getElementById('player'); console.log(src); @@ -145,13 +139,11 @@ jQuery(function($) { document.getElementById("lienep").innerHTML= title; document.getElementById("sbody").innerHTML= body + "...."; document.getElementById("lienep").href= linkdec; -<<<<<<< HEAD:assets/js/site.js document.getElementById("player").pause(); document.getElementById("player").setAttribute('src', linkdec); document.getElementById("player").load(); document.getElementById("player").play(); Cookies.set("lastep-title", title, { expires: 365 }) -======= audio.pause(); audio.setAttribute('src', linkdec); if (title == Cookies.get("lastep_b4close-title")){ @@ -160,7 +152,6 @@ jQuery(function($) { audio.load(); audio.play(); Cookies.set("lastep-title", title, { expires: 365 }); ->>>>>>> ee5d4c2 (player can save time after win close):public/assets/js/site.js Cookies.set("lastep-src", audio.src, { expires: 365 }); Cookies.set("lastep-body", body, { expires: 365 }) } From 6f9b8c62cef9bcc75950d434c3dc8315fd43ae0b Mon Sep 17 00:00:00 2001 From: quoije Date: Mon, 22 Aug 2022 02:36:37 -0400 Subject: [PATCH 4/4] player can save time after win close --- assets/css/oof.css | 8 ++++++ assets/js/site.js | 67 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/assets/css/oof.css b/assets/css/oof.css index 3bc7b22..70edfb2 100644 --- a/assets/css/oof.css +++ b/assets/css/oof.css @@ -60,6 +60,14 @@ body { font-style: normal; } +#audioplayerdivstop { + margin-bottom: 160px; +} + +#playicon { + margin-bottom: 2px; +} + #ws:link { text-decoration: none; color: inherit; diff --git a/assets/js/site.js b/assets/js/site.js index d6168b3..933e0d6 100644 --- a/assets/js/site.js +++ b/assets/js/site.js @@ -49,9 +49,25 @@ jQuery(function($) { 'top': $("#playerwindow").data('origionalTop') }); topFunction(); - document.getElementById("player").pause(); }); + + $(".closewin").click(function() { + $("#playerwindow").css({ + 'left': $("#playerwindow").data('originalLeft'), + 'top': $("#playerwindow").data('origionalTop') + }); + topFunction(); + document.getElementById("sbody").innerHTML= ""; + document.getElementById("player").pause(); + keeplastepcache(); + document.getElementById("player").setAttribute('src', ""); + document.getElementById("lienep").href = ""; + document.getElementById("nomep").innerHTML = "Pas d'épisode en cours"; + document.getElementById("epstab").innerHTML = "épisodes"; + clearcache(); + }); + var audio = document.getElementById('player'); console.log(audio.src); @@ -73,6 +89,47 @@ jQuery(function($) { // player things + function checkepcache(){ + if (Cookies.get("lastep-src")){ + console.log("yahh"); + const epstab = document.getElementById("epstab"); + playicon(); + }; + } + + function keeplastepcache(){ + Cookies.set("lastep_b4close-title", document.getElementById("lienep").innerHTML, { expires: 365 }); + Cookies.set("lastep_b4close-time", document.getElementById("player").currentTime, { expires: 365 }); + } + + function clearcache(){ + Cookies.remove("lastep-title"); + Cookies.remove("lastep-body"); + Cookies.remove("lastep-src"); + Cookies.remove("lastep-time"); + } + + // player things + + function playicon(){ + const epstab = document.getElementById("epstab"); + if (document.getElementById("lienep").src = "") + { + epstab.innerHTML = "épisodes"; + } + else { + console.log("ayyyy"); + epstab.innerHTML = "" + " épisodes"; + } + + } + + function stopplayer(){ + document.getElementById("lienep").innerHTML= title; + document.getElementById("sbody").innerHTML= body + "...."; + document.getElementById("lienep").href= linkdec; + } + function play(src, title, date, body) { var audio = document.getElementById('player'); console.log(src); @@ -88,6 +145,14 @@ jQuery(function($) { document.getElementById("player").load(); document.getElementById("player").play(); Cookies.set("lastep-title", title, { expires: 365 }) + audio.pause(); + audio.setAttribute('src', linkdec); + if (title == Cookies.get("lastep_b4close-title")){ + audio.currentTime = Cookies.get("lastep_b4close-time"); + } + audio.load(); + audio.play(); + Cookies.set("lastep-title", title, { expires: 365 }); Cookies.set("lastep-src", audio.src, { expires: 365 }); Cookies.set("lastep-body", body, { expires: 365 }) }