rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Add links to playlist entries and the index page

Browse source
This commit is contained in:
calzoneman 2013-05-12 11:41:14 -04:00
parent 161c8517b2
commit 3af35cb268
7 changed files with 119 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

27
www/assets/js/client.js
View file

@ -322,32 +322,7 @@ $("#getplaylist").click(function() {
socket.listeners("playlist").indexOf(callback));
var list = [];
for(var i = 0; i < data.pl.length; i++) {
var entry;
switch(data.pl[i].type) {
case "yt":
entry = "http://youtube.com/watch?v="+data.pl[i].id;
break;
case "vi":
entry = "http://vimeo.com/"+data.pl[i].id;
break;
case "dm":
entry = "http://dailymotion.com/video/"+data.pl[i].id;
break;
case "sc":
entry = data.pl[i].id;
break;
case "li":
entry = "http://livestream.com/"+data.pl[i].id;
break;
case "tw":
entry = "http://twitch.tv/"+data.pl[i].id;
break;
case "rt":
entry = data.pl[i].id;
break;
default:
break;
}
var entry = idToURL(data.pl[i]);
list.push(entry);
}
var urls = list.join(",");

37
www/assets/js/functions.js
View file

@ -246,8 +246,10 @@ function makeQueueEntry(video) {
.css("clear", "both")
.appendTo(li);
}
var title = $("<span />").addClass("qe_title").appendTo(li);
title.text(video.title);
var title = $("<a/>").addClass("qe_title").appendTo(li)
.text(video.title)
.attr("href", idToURL(video))
.attr("target", "_blank");
var time = $("<span />").addClass("qe_time").appendTo(li);
time.text(video.duration);
var clear = $("<div />").addClass("qe_clear").appendTo(li);
@ -941,3 +943,34 @@ function applyOpts() {
$("#videodiv").remove();
}
}
function idToURL(data) {
var entry = "";
switch(data.type) {
case "yt":
entry = "http://youtube.com/watch?v="+data.id;
break;
case "vi":
entry = "http://vimeo.com/"+data.id;
break;
case "dm":
entry = "http://dailymotion.com/video/"+data.id;
break;
case "sc":
entry = data.id;
break;
case "li":
entry = "http://livestream.com/"+data.id;
break;
case "tw":
entry = "http://twitch.tv/"+data.id;
break;
case "rt":
case "jw":
entry = data.id;
break;
default:
break;
}
return entry;
}

42
www/channellist.html
View file

@ -73,11 +73,40 @@
p = "name=" + uname + "&session=" + session;
}
});
refresh();
setInterval(refresh, 5000);
});
function idToURL(data) {
var entry = "";
switch(data.type) {
case "yt":
entry = "http://youtube.com/watch?v="+data.id;
break;
case "vi":
entry = "http://vimeo.com/"+data.id;
break;
case "dm":
entry = "http://dailymotion.com/video/"+data.id;
break;
case "sc":
entry = data.id;
break;
case "li":
entry = "http://livestream.com/"+data.id;
break;
case "tw":
entry = "http://twitch.tv/"+data.id;
break;
case "rt":
case "jw":
entry = data.id;
break;
default:
break;
}
return entry;
}
function refresh() {
$.getJSON(IO_URL+"/api/json/listloaded?"+p+"&callback=?", function(data) {
var host = document.location + "";
@ -107,8 +136,17 @@
.text(d.name)
.appendTo(name);
$("<td/>").text(d.usercount || 0).appendTo(tr);
var title = $("<td/>").appendTo(tr);
if(d.media.id) {
$("<a/>").appendTo(title)
.text(d.media.title)
.attr("href", idToURL(d.media))
.attr("target", "_blank");
}
else {
title.text("-");
}
total += (d.usercount || 0);
$("<td/>").text(d.title || "-").appendTo(tr);
}
var tr = $("<tr/>").appendTo($("#channeldata"));

41
www/index.html
View file

@ -94,6 +94,36 @@
host = "http://" + host;
setInterval(refresh, 10000);
refresh();
function idToURL(data) {
var entry = "";
switch(data.type) {
case "yt":
entry = "http://youtube.com/watch?v="+data.id;
break;
case "vi":
entry = "http://vimeo.com/"+data.id;
break;
case "dm":
entry = "http://dailymotion.com/video/"+data.id;
break;
case "sc":
entry = data.id;
break;
case "li":
entry = "http://livestream.com/"+data.id;
break;
case "tw":
entry = "http://twitch.tv/"+data.id;
break;
case "rt":
case "jw":
entry = data.id;
break;
default:
break;
}
return entry;
}
function refresh() {
$.getJSON(IO_URL+"/api/json/listloaded?filter=public&callback=?", function(data) {
$("#channeldata").find("tbody").remove();
@ -115,7 +145,16 @@
.text(d.name)
.appendTo(name);
$("<td/>").text(d.usercount || 0).appendTo(tr);
$("<td/>").text(d.title || "-").appendTo(tr);
var title = $("<td/>").appendTo(tr);
if(d.media.id) {
$("<a/>").appendTo(title)
.text(d.media.title)
.attr("href", idToURL(d.media))
.attr("target", "_blank");
}
else {
title.text("-");
}
}
});
}