Html #3

Closed
quoije wants to merge 10 commits from html into nodejs
2 changed files with 85 additions and 1 deletions
Showing only changes of commit c66bee62aa - Show all commits
+11
View File
@@ -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;
+74 -1
View File
@@ -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 = "<a id='lienep' target='_blank'>Pas d'épisode en cours</a>";
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 = "<img id='playicon' src='assets/img/spek.icon.svg' width='20px'></img>" + " é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 })
}