diff --git a/changelog b/changelog index f2f7c298..829e6fa7 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,9 @@ +Thu Oct 03 22:09 2013 CDT + * www/assets/js/ui.js: Use sortable("cancel") to remove the need for + the `moveby` field of the movement packet + * www/assets/js/util.js, www/assets/js/callbacks.js, lib/channel.js: + Remove references to moveby + Thu Oct 03 22:05 2013 CDT * lib/channel.js, lib/playlist.js: Fix 'next' bumping not properly telling clients that the old item was deleted diff --git a/lib/channel.js b/lib/channel.js index 089a0006..d1d71204 100644 --- a/lib/channel.js +++ b/lib/channel.js @@ -1762,11 +1762,6 @@ Channel.prototype.move = function(data, user) { return; if (self.playlist.move(data.from, data.after)) { - var moveby = user && user.name ? user.name : null; - if (typeof data.moveby !== "undefined") - moveby = data.moveby; - - var fromit = self.playlist.items.find(data.from); var afterit = self.playlist.items.find(data.after); var aftertitle = (afterit && afterit.media) @@ -1780,7 +1775,6 @@ Channel.prototype.move = function(data, user) { self.sendAll("moveVideo", { from: data.from, after: data.after, - moveby: moveby }); } diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index 0e4d643f..5c451ea4 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -867,13 +867,11 @@ Callbacks = { }, moveVideo: function(data) { - if (data.moveby != CLIENT.name) { - PL_ACTION_QUEUE.queue(function (plq) { - playlistMove(data.from, data.after, function () { - plq.release(); - }); + PL_ACTION_QUEUE.queue(function (plq) { + playlistMove(data.from, data.after, function () { + plq.release(); }); - } + }); }, setCurrent: function(uid) { diff --git a/www/assets/js/ui.js b/www/assets/js/ui.js index a65fb2ff..b179cede 100644 --- a/www/assets/js/ui.js +++ b/www/assets/js/ui.js @@ -316,6 +316,7 @@ $("#queue").sortable({ from: PL_FROM, after: PL_AFTER }); + $("#queue").sortable("cancel"); } }); $("#queue").disableSelection(); diff --git a/www/assets/js/util.js b/www/assets/js/util.js index d5933273..1dbcd37b 100644 --- a/www/assets/js/util.js +++ b/www/assets/js/util.js @@ -419,8 +419,7 @@ function addQueueButtons(li) { .click(function() { socket.emit("moveMedia", { from: li.data("uid"), - after: PL_CURRENT, - moveby: null + after: PL_CURRENT }); }) .appendTo(menu);