mirror of https://github.com/calzoneman/sync.git
Tweak movement
This commit is contained in:
parent
89422c3c1d
commit
6309e42989
|
@ -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
|
||||
|
|
|
@ -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
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
setCurrent: function(uid) {
|
||||
|
|
|
@ -316,6 +316,7 @@ $("#queue").sortable({
|
|||
from: PL_FROM,
|
||||
after: PL_AFTER
|
||||
});
|
||||
$("#queue").sortable("cancel");
|
||||
}
|
||||
});
|
||||
$("#queue").disableSelection();
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue