From 55247e4f56296ee5721e0db5e533cc2b2c431b2c Mon Sep 17 00:00:00 2001
From: Nils Asmussen <nils@script-solution.de>
Date: Fri, 29 Jul 2016 23:56:45 +0200
Subject: [PATCH] Load album view just once.

---
 src/scripts/album.js | 59 ++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/scripts/album.js b/src/scripts/album.js
index d95198f..d7cdc0d 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -100,39 +100,44 @@ album.load = function(albumID, refresh = false) {
 
 			setTimeout(() => {
 
-				view.album.init()
+				let finish = function() {
+					view.album.init()
 
-				if (refresh===false) {
-					lychee.animate(lychee.content, 'contentZoomIn')
-					header.setMode('album')
+					if (refresh===false) {
+						lychee.animate(lychee.content, 'contentZoomIn')
+						header.setMode('album')
+					}
+				}
+
+				if (!album.isSmartID(albumID)) {
+					params = {
+						parent: albumID
+					}
+
+					api.post('Albums::get', params, function(data) {
+
+						let waitTime = 0
+
+						album.subjson = data
+
+						// Calculate delay
+						let durationTime = (new Date().getTime() - startTime)
+						if (durationTime>300) waitTime = 0
+						else                  waitTime = 300 - durationTime
+
+						setTimeout(() => {
+							finish()
+						}, waitTime)
+
+					})
+				}
+				else {
+					finish()
 				}
 
 			}, waitTime)
 
 		})
-
-		if (!album.isSmartID(albumID)) {
-			params = {
-				parent: albumID
-			}
-
-			api.post('Albums::get', params, function(data) {
-
-				let waitTime = 0
-
-				album.subjson = data
-
-				// Calculate delay
-				let durationTime = (new Date().getTime() - startTime)
-				if (durationTime>300) waitTime = 0
-				else                  waitTime = 300 - durationTime
-
-				setTimeout(() => {
-					view.album.init()
-				}, waitTime)
-
-			})
-		}
 	})
 
 }