diff --git a/lib/channel.js b/lib/channel.js index 8b40290b..2cf4fda3 100644 --- a/lib/channel.js +++ b/lib/channel.js @@ -1405,7 +1405,6 @@ Channel.prototype.addMedia = function(data, user) { m.temp = data.temp; var res = self.playlist.addMedia(m); if (res.error) { - console.log(res); user.socket.emit("queueFail", res.error); q.release(); return; diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index 3d45cb6d..f342ed24 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -796,11 +796,30 @@ Callbacks = { }, queueFail: function(data) { - if(!data) { + if (!data) { data = "Queue failed. Check your link to make sure it is valid."; } + var alerts = $(".qfalert"); + for (var i = 0; i < alerts.length; i++) { + var al = $(alerts[i]); + var cl = al.clone(); + cl.children().remove(); + if (cl.text() === data) { + var tag = al.find(".label-important"); + if (tag.length > 0) { + var count = parseInt(tag.text().match(/\d+/)[0]) + 1; + tag.text(tag.text().replace(/\d+/, ""+count)); + } else { + $("") + .addClass("label label-important pull-right") + .text("+ 1 more") + .appendTo(al); + } + return; + } + } makeAlert("Error", data, "alert-error") - .addClass("span12") + .addClass("span12 qfalert") .insertBefore($("#extended_controls")); },