arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed sorting of move and switch album context menu

Browse Source
This commit is contained in:
Tobias Reich 2015-04-06 19:28:21 +02:00
parent 4177219f67
commit 5c40f43290
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/main.js vendored
View File

Binary file not shown.

32
src/scripts/contextMenu.js
View File

@ -71,16 +71,12 @@ contextMenu.albumMulti = function(albumIDs, e) {
contextMenu.albumTitle = function(albumID, e) {
var items = [
{ type: 'item', title: build.iconic('pencil') + 'Rename', fn: function() { album.setTitle([albumID]) } }
];
var items = [];
api.post('Album::getAll', {}, function(data) {
if (data.num>1) {
items.push({ type: 'separator' });
// Generate list of albums
$.each(data.albums, function(index) {
@ -91,12 +87,16 @@ contextMenu.albumTitle = function(albumID, e) {
title = "<img class='cover' width='16' height='16' src='" + that.thumbs[0] + "'><div class='title'>" + that.title + "</div>";
if (that.id!=albumID) items.push({ type: 'item', title, fn: function() { lychee.goto(that.id) } });
if (that.id!=albumID) items.unshift({ type: 'item', title, fn: function() { lychee.goto(that.id) } });
});
items.unshift({ type: 'separator' });
}
items.unshift({ type: 'item', title: build.iconic('pencil') + 'Rename', fn: function() { album.setTitle([albumID]) } });
basicContext.show(items, e, contextMenu.close);
});
@ -198,16 +198,6 @@ contextMenu.move = function(photoIDs, e) {
var items = [];
// Show Unsorted when unsorted is not the current album
if (album.getID()!=='0') {
items = [
{ type: 'item', title: 'Unsorted', fn: function() { photo.setAlbum(photoIDs, 0) } },
{ type: 'separator' }
];
}
api.post('Album::getAll', {}, function(data) {
if (data.num===0) {
@ -227,10 +217,18 @@ contextMenu.move = function(photoIDs, e) {
if (!that.thumbs[0]) that.thumbs[0] = 'src/images/no_cover.svg';
that.title = "<img class='cover' width='16' height='16' src='" + that.thumbs[0] + "'><div class='title'>" + that.title + "</div>";
if (that.id!=album.getID()) items.push({ type: 'item', title: that.title, fn: function() { photo.setAlbum(photoIDs, that.id) } });
if (that.id!=album.getID()) items.unshift({ type: 'item', title: that.title, fn: function() { photo.setAlbum(photoIDs, that.id) } });
});
// Show Unsorted when unsorted is not the current album
if (album.getID()!=='0') {
items.unshift({ type: 'separator' });
items.unshift({ type: 'item', title: 'Unsorted', fn: function() { photo.setAlbum(photoIDs, 0) } });
}
}
basicContext.show(items, e, contextMenu.close);