on exiting slideshow, stay on current image

chizutan5 · Nov 11, 2021 · 0c835b4 · 0c835b4
1 parent 9aa9026
commit 0c835b4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/config/configuration.go b/config/configuration.go
@@ -86,7 +86,7 @@ var SessionStore *sessions.CookieStore
 var Configuration ConfigurationSettings
 
 //ApplicationVersion Current version of application. This should be incremented every release
-var ApplicationVersion = "1.0.4.2"
+var ApplicationVersion = "1.0.4.3"
 
 //SessionVariableName is used when checking cookies
 var SessionVariableName = "gib-session"

diff --git a/http/image-slideshow-js.html b/http/image-slideshow-js.html
@@ -2,6 +2,7 @@
 	<body>
 		<script>
 			SSImageQuery = encodeURI("{{.OldQuery}}");
+			CurrentID = {{.ImageContentInfo.ID}};
 			function OnLoadStartNextSlideTimer() {
 				var time = {{.SlideShowSpeed}};
 				setTimeout(LoadNextSlide, time*1000) //30seconds
@@ -18,6 +19,7 @@
 						$("#ImageGridContainer").empty();
 						$("#ImageGridContainer").append(EmbedData);
 						ImageType = GetImageType(jsonData.Images[0].Location);
+						CurrentID = jsonData.Images[0].ID;
 						if (ImageType=="image") {
 							$("#ImageContent").on('load', function() { CorrectImageOrient("IMGContent"); });
 						}
@@ -31,7 +33,7 @@
 				//Replace ImageGridContainer children, with new image
 			}
 			function QuitSlideShow() {
-				window.location.href = "/images?ViewMode=grid&SearchTerms="+SSImageQuery;
+				window.location.href = "/image?ID="+CurrentID+"&ViewMode=grid&SearchTerms="+SSImageQuery;
 			}
 			window.addEventListener('load', OnLoadStartNextSlideTimer());
 			Mousetrap.bind("enter", QuitSlideShow)
@@ -52,5 +54,5 @@
 				{{end}}
 			</div>
 		</div>
-		<div style="position: fixed;bottom: 0px;left: 0px;"><a href="/images?ViewMode=grid&SearchTerms={{.OldQuery}}">Click here</a> or press Enter to exit slide show</div>
+		<div style="position: fixed;bottom: 0px;left: 0px;"><a href="/images?ViewMode=grid&SearchTerms={{.OldQuery}}" onclick="QuitSlideShow(); return false;">Click here</a> or press Enter to exit slide show</div>
 {{template "footer.html" .}}
diff --git a/routers/imagerouter.go b/routers/imagerouter.go
@@ -23,6 +23,30 @@ func ImageGetRouter(responseWriter http.ResponseWriter, request *http.Request) {
 	var requestedID uint64
 	var err error
 
+	//Change StreamView if requested
+	if request.FormValue("ViewMode") == "stream" {
+		TemplateInput.ViewMode = "stream"
+		_, _, session := getSessionInformation(request)
+		session.Values["ViewMode"] = "stream"
+		session.Save(request, responseWriter)
+	} else if request.FormValue("ViewMode") == "slideshow" {
+		TemplateInput.ViewMode = "slideshow"
+		_, _, session := getSessionInformation(request)
+		session.Values["ViewMode"] = "slideshow"
+		if request.FormValue("slideshowspeed") != "" {
+			parsedSSS, err := strconv.ParseInt(request.FormValue("slideshowspeed"), 10, 64)
+			if err == nil && parsedSSS > 0 {
+				session.Values["slideshowspeed"] = parsedSSS
+			}
+		}
+		session.Save(request, responseWriter)
+	} else if request.FormValue("ViewMode") != "" { //default to grid on invalid modes
+		TemplateInput.ViewMode = "grid"
+		_, _, session := getSessionInformation(request)
+		session.Values["ViewMode"] = "grid"
+		session.Save(request, responseWriter)
+	}
+
 	//ID should come from request
 	requestedID, err = strconv.ParseUint(request.FormValue("ID"), 10, 32)
 	if err != nil {