Added schedule airtimes, fixed layout issues, locked down fore,st(guest disable), contrast fixes (css)
This commit is contained in:
parent
b0570f2c15
commit
55a9fcf465
20 changed files with 279 additions and 1238 deletions
|
|
@ -676,6 +676,9 @@ Callbacks = {
|
|||
li.attr("title", data[i].queueby
|
||||
? ("Added by: " + data[i].queueby)
|
||||
: "Added by: Unknown");
|
||||
if(data[i].media.type === "fi"){
|
||||
li.attr("id", "filei");
|
||||
}
|
||||
li.appendTo(q);
|
||||
}
|
||||
|
||||
|
|
@ -688,14 +691,22 @@ Callbacks = {
|
|||
c += "s";
|
||||
$("#plcount").text(c);
|
||||
$("#pllength").text(data.time);
|
||||
startTimes = data.sTimes;
|
||||
dispSTimes();
|
||||
},
|
||||
|
||||
queue: function(data) {
|
||||
PL_ACTION_QUEUE.queue(function (plq) {
|
||||
stopQueueSpinner(data.item.media);
|
||||
var li = makeQueueEntry(data.item, true);
|
||||
if (data.item.uid === PL_CURRENT)
|
||||
if (data.item.uid === PL_CURRENT){
|
||||
li.addClass("queue_active");
|
||||
activeItem = data.uid;
|
||||
}
|
||||
if(data.item.media.type === "fi"){
|
||||
li.attr("id", "filei");
|
||||
}
|
||||
|
||||
li.hide();
|
||||
var q = $("#queue");
|
||||
li.attr("title", data.item.queueby
|
||||
|
|
@ -774,6 +785,7 @@ Callbacks = {
|
|||
|
||||
moveVideo: function(data) {
|
||||
PL_ACTION_QUEUE.queue(function (plq) {
|
||||
startTimes = data.sTimes;
|
||||
playlistMove(data.from, data.after, function () {
|
||||
plq.release();
|
||||
});
|
||||
|
|
@ -786,6 +798,7 @@ Callbacks = {
|
|||
var li = $(".pluid-" + uid);
|
||||
if (li.length !== 0) {
|
||||
li.addClass("queue_active");
|
||||
activeItem = uid;
|
||||
var tmr = setInterval(function () {
|
||||
if (!PL_WAIT_SCROLL) {
|
||||
scrollQueue();
|
||||
|
|
|
|||
38
www/js/fschd.js
Normal file
38
www/js/fschd.js
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
var startTimes = [[],[]]//UID's, StartTimes
|
||||
var activeItem = 0;//active UID;
|
||||
var rptime = 0;//reference playlist time
|
||||
var rltime = 0;//refernce local time(epoch)
|
||||
var ctime = 0;
|
||||
|
||||
const st = new Date();//scratchtime
|
||||
|
||||
function dispSTimes(){//update sTimes
|
||||
var ptimeString, ltimeString;
|
||||
calcRefs();//iterate and findRefs before calcTime
|
||||
|
||||
//iterate and print
|
||||
for(var i = 0; i < startTimes[0].length; i++){//for every item startTime
|
||||
var rdif = startTimes[1][i] - rptime;
|
||||
st.setTime(rltime + (rdif * 1000));
|
||||
ltimeString = "airdate: " + st.toLocaleTimeString() + " " + st.toLocaleDateString() + "</br>";
|
||||
ptimeString = "(pref time) " + formatTime(startTimes[1][i]);// create ptimeString
|
||||
|
||||
if(document.getElementsByClassName("pluid-" + startTimes[0][i])[0] != null || document.getElementsByClassName("pluid-" + startTimes[0][i])[0] != undefined){//if current item isnt null or undefined
|
||||
|
||||
document.getElementsByClassName("pluid-" + startTimes[0][i])[0].getElementsByClassName("qe_sTime")[0].innerHTML = ltimeString + ptimeString;// set current item qe_sTime innerHTML to ptimeString
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function calcRefs(){
|
||||
ld = new Date();//localdate
|
||||
for(var i = 0; i < startTimes[0].length; i++){//for every item startTime/until activeItem
|
||||
if(startTimes[0][i] == activeItem){
|
||||
rptime = startTimes[1][i];
|
||||
}
|
||||
}
|
||||
PLAYER.getTime(function(seek){ctime = seek});
|
||||
rltime = ld.getTime() - (ctime * 1000);
|
||||
}
|
||||
|
|
@ -1624,6 +1624,8 @@
|
|||
window.handleMediaUpdate = function(data) {
|
||||
var PLAYER, waiting;
|
||||
PLAYER = window.PLAYER;
|
||||
handleWindowResize();
|
||||
dispSTimes();
|
||||
if (typeof PLAYER.mediaLength === 'number' && PLAYER.mediaLength > 0 && data.currentTime > PLAYER.mediaLength) {
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -320,7 +320,8 @@ $("#queue").sortable({
|
|||
PL_AFTER = $(prev[0]).data("uid");
|
||||
socket.emit("moveMedia", {
|
||||
from: PL_FROM,
|
||||
after: PL_AFTER
|
||||
after: PL_AFTER,
|
||||
sTimes: [[],[]]
|
||||
});
|
||||
$("#queue").sortable("cancel");
|
||||
}
|
||||
|
|
@ -938,3 +939,4 @@ $("#resize-video-smaller").click(function () {
|
|||
console.error(error);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -466,6 +466,7 @@ function scrollQueue() {
|
|||
function makeQueueEntry(item, addbtns) {
|
||||
var video = item.media;
|
||||
var li = $("<li/>");
|
||||
console.log(item);
|
||||
li.addClass("queue_entry");
|
||||
li.addClass("pluid-" + item.uid);
|
||||
li.data("uid", item.uid);
|
||||
|
|
@ -482,7 +483,11 @@ function makeQueueEntry(item, addbtns) {
|
|||
.attr("href", formatURL(video))
|
||||
.attr("target", "_blank");
|
||||
var time = $("<span/>").addClass("qe_time").appendTo(li);
|
||||
time.text(video.duration);
|
||||
time.text("airtime: " + video.duration);
|
||||
$("<br/>").appendTo(li);
|
||||
var sTime = $("<span/>").addClass("qe_sTime").appendTo(li);
|
||||
sTime.text(" \n");
|
||||
//dispSTimes();
|
||||
var clear = $("<div/>").addClass("qe_clear").appendTo(li);
|
||||
if(item.temp) {
|
||||
li.addClass("queue_temp");
|
||||
|
|
@ -533,7 +538,8 @@ function addQueueButtons(li) {
|
|||
.click(function() {
|
||||
socket.emit("moveMedia", {
|
||||
from: li.data("uid"),
|
||||
after: PL_CURRENT
|
||||
after: PL_CURRENT,
|
||||
sTimes: [[],[]]
|
||||
});
|
||||
})
|
||||
.appendTo(menu);
|
||||
|
|
@ -2890,6 +2896,7 @@ function checkScriptAccess(viewSource, type, cb) {
|
|||
setOpt("channel_js_pref", JSPREF);
|
||||
}
|
||||
cb("ALLOW");
|
||||
handleVideoResize();
|
||||
});
|
||||
|
||||
$("#chanjs-deny").click(function () {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue