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

Properly redirect after album {delete,move,merge}.

Browse Source 
That is, we don't redirect to the albums view, but to the current album
or the parent album if the current one has been deleted.
This commit is contained in:
Nils Asmussen 2016-08-13 16:03:37 +02:00
parent 7126354d7a
commit 5ee34c50a4
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/scripts/album.js
View File

@ -256,6 +256,21 @@ album.delete = function(albumIDs) {
albums.deleteByID(id)
})
} else if (visible.album()) {
// if we deleted the current album, go to its parent
if (albumIDs.length==1 && album.json.id==albumIDs[0]) {
let id = album.getParent()
album.refresh()
lychee.goto(id)
}
// otherwise, we deleted a subalbum
else {
album.reload()
}
} else {
albums.refresh()
@ -684,12 +699,8 @@ album.merge = function(albumIDs, titles = []) {
api.post('Album::merge', params, function(data) {
if (data!==true) {
lychee.error(null, params, data)
} else {
albums.refresh()
lychee.goto()
}
if (data!==true) lychee.error(null, params, data)
else album.reload()
})
@ -724,12 +735,8 @@ album.move = function(albumIDs, titles = []) {
api.post('Album::move', params, function(data) {
if (data!==true) {
lychee.error(null, params, data)
} else {
albums.refresh()
lychee.goto()
}
if (data!==true) lychee.error(null, params, data)
else album.reload()
})
@ -750,4 +757,23 @@ album.move = function(albumIDs, titles = []) {
}
})
}
album.reload = function() {
let albumID = album.getID()
album.refresh()
albums.refresh()
if (visible.album()) lychee.goto(albumID)
else lychee.goto()
}
album.refresh = function() {
album.json = null
album.subjson = null
}