From 263eed3447b870b55067ae60e3a268df803161fb Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 18 Oct 2014 17:36:49 +0200
Subject: [PATCH] When deleting picture from album show next picture #242

---
 dist/main.js         | Bin 172010 -> 172092 bytes
 src/scripts/photo.js |  14 ++++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 2bfa99821229af67f5b8b707fa9819f7a2f074b2..d2808a5c6da1e0b7a5138a4f3b597bcf7aa8af9f 100644
GIT binary patch
delta 367
zcmaF0pKH$nt_{b889gT-7j9$p+w3Ruiv>t|O6~+v%yQqwfYfi3Jp#<0I)0OPxn?nX
zZdP^s#m?wAS;6lKkYx3@2C8uMcjf}hv__^d0;yL~^B94GoiSoSYVv|ukcvC80YItA
zy7AUP1)1>&BtZsl)~P%k2o(Kr$_J>#_H-%G(#f08hXR#wUSQ<_a`<l;13At&<|_l0
zJ^rn%>8YVqoRMFyq^VP!lbMnlT3`hf$pEroA|d(d={c!Zo}2am=$Wy3=GhwP_)SkX
zV$5do%hU9me#wY&1*7NoYGXzppyQ^WFk$@9=(qiZDWlSN4qGK9oqQm%{f!QjDdY6x
zW=w+GWtqj9Nja%{1sVAz`5KyPYD!9qwzhd{YI#5kEU1^BTH@)Vp=m!oP?JfHIZxAS
dx}qMF?)G>+rYILiuIW3AnEr0xUd&{y0{|);d!zsW

delta 324
zcmdmUfa}$Mt_{b88T}?77j9$p-0Uaviv>t|O6~+v%yQqwfYfi3Jp#;rI-Zkvxn?o?
zZB}*r#m?wCS;6lKkYx3@2C8uMcjf}hv__^d0;yL~^B94GoiSoSYVv|ukcvC80YItA
zy7AUP1)1>&BtZsl)~P%k2o(Kr$_J>#_H-%G(#f08hXR#wUSQ<_a`<l;13At&<|_l0
zJ^rn%>8GJooRMFyq^VP!lbMnlT3`hf$pEroA|d(d={c!Zew+3G=$Wzk<=GnOcur3?
zV$5do%+vIoe#wY&1*6~gYGXzppyQ^WFk$@9=(+ubDWlSNW}STN=`AKqnbTu*nNCk{
r(PPr(Ps~Xw%`Mg|N=++DEzZ!`zFv<h#$`HBG1Fg0uI-#9OvX9@y*Y4<

diff --git a/src/scripts/photo.js b/src/scripts/photo.js
index 602cabf..e18c779 100644
--- a/src/scripts/photo.js
+++ b/src/scripts/photo.js
@@ -53,7 +53,7 @@ photo = {
 
 	},
 
-	//preload the next photo for better response time
+	// Preload the next photo for better response time
 	preloadNext: function(photoID) {
 
 		var nextPhoto,
@@ -185,8 +185,8 @@ photo = {
 		buttons = [
 			["", function() {
 
-				var nextPhoto,
-					previousPhoto;
+				var nextPhoto = "",
+					previousPhoto = "";
 
 				photoIDs.forEach(function(id, index, array) {
 
@@ -206,11 +206,13 @@ photo = {
 
 				});
 
-				// Only when search is not active
-				if (!visible.albums()) lychee.goto(album.getID());
-
 				albums.refresh();
 
+				// Go to next photo if there is a next photo and
+				// next photo is not the current one. Show album otherwise.
+				if (visible.photo()&&nextPhoto!==""&&nextPhoto!==photo.getID()) lychee.goto(album.getID() + "/" + nextPhoto);
+				else if (!visible.albums()) lychee.goto(album.getID());
+
 				params = "deletePhoto&photoIDs=" + photoIDs;
 				lychee.api(params, function(data) {