specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix queue progress bar for youtube playlists

Browse source
This commit is contained in:
calzoneman 2016-05-21 16:13:58 -07:00
parent 75245e4d98
commit a00820a4c6
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/js/callbacks.js
View file

@ -724,7 +724,7 @@ Callbacks = {
queue: function(data) { queue: function(data) {
PL_ACTION_QUEUE.queue(function (plq) { PL_ACTION_QUEUE.queue(function (plq) {
stopQueueSpinner(data.item.media.id); stopQueueSpinner(data.item.media);
var li = makeQueueEntry(data.item, true); var li = makeQueueEntry(data.item, true);
if (data.item.uid === PL_CURRENT) if (data.item.uid === PL_CURRENT)
li.addClass("queue_active"); li.addClass("queue_active");

2
www/js/ui.js
View file

@ -420,7 +420,7 @@ function queue(pos, src) {
delete data.link; delete data.link;
socket.emit("queue", data); socket.emit("queue", data);
startQueueSpinner(data.id); startQueueSpinner(data);
if (emitQueue.length > 0) { if (emitQueue.length > 0) {
notification.textContent = "Waiting to queue " + emitQueue[0].link; notification.textContent = "Waiting to queue " + emitQueue[0].link;
} else { } else {

17
www/js/util.js
View file

@ -3041,11 +3041,16 @@ function showChannelSettings() {
// There is a point where this file needed to stop and we have clearly passed // There is a point where this file needed to stop and we have clearly passed
// it but let's keep going and see what happens // it but let's keep going and see what happens
function startQueueSpinner(id) { function startQueueSpinner(data) {
if ($("#queueprogress").length > 0) { if ($("#queueprogress").length > 0) {
return; return;
} }
var id = data.id;
if (data.type === "yp") {
id = "$any";
}
var progress = $("<div/>").addClass("progress").attr("id", "queueprogress") var progress = $("<div/>").addClass("progress").attr("id", "queueprogress")
.data("queue-id", id); .data("queue-id", id);
var progressBar = $("<div/>").addClass("progress-bar progress-bar-striped active") var progressBar = $("<div/>").addClass("progress-bar progress-bar-striped active")
@ -3060,10 +3065,12 @@ function startQueueSpinner(id) {
progress.appendTo($("#addfromurl")); progress.appendTo($("#addfromurl"));
} }
function stopQueueSpinner(id) { function stopQueueSpinner(data) {
if (id && $("#queueprogress").data("queue-id") === id) { var shouldRemove = (typeof data === 'object' &&
$("#queueprogress").remove(); $("#queueprogress").data("queue-id") === data.id);
} else if (id === null) { shouldRemove = shouldRemove || data === null;
shouldRemove = shouldRemove || $("#queueprogress").data("queue-id") === "$any";
if (shouldRemove) {
$("#queueprogress").remove(); $("#queueprogress").remove();
} }
} }