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

Fix comma separated queues

Browse source
This commit is contained in:
calzoneman 2013-09-30 09:51:38 -05:00
parent 2fc8349daf
commit 0eda0b8ed2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/channel.js
View file

@ -1343,6 +1343,11 @@ Channel.prototype.tryQueue = function(user, data) {
data.temp = !this.hasPermission(user, "addnontemp"); data.temp = !this.hasPermission(user, "addnontemp");
if (data.list) { if (data.list) {
if (data.pos === "next") {
data.list.reverse();
if (this.playlist.items.length === 0)
data.list.unshift(data.list.pop());
}
for (var i = 0; i < data.list.length; i++) { for (var i = 0; i < data.list.length; i++) {
data.list[i].pos = data.pos; data.list[i].pos = data.pos;
this.tryQueue(user, data.list[i]); this.tryQueue(user, data.list[i]);

3
www/assets/js/ui.js
View file

@ -323,9 +323,6 @@ function queue(pos) {
return; return;
} }
var links = $("#mediaurl").val().split(","); var links = $("#mediaurl").val().split(",");
if(pos == "next") {
links = links.reverse();
}
var parsed = []; var parsed = [];
links.forEach(function(link) { links.forEach(function(link) {
var data = parseMediaLink(link); var data = parseMediaLink(link);