Remember user preference for the visibility of the "about" panel (#276)

* sidebar.toggle() now takes a boolean to tell if ths action was user-generated or not, to store this preference in the sessionStorage of the user's browser Signed-off-by: Louis Vallat <louis@louis-vallat.xyz> * Added the hooks to toggle sidebar if not visible when showing the button_info, according to the last user's choice Signed-off-by: Louis Vallat <louis@louis-vallat.xyz> * Fixed trailing spaces Signed-off-by: Louis Vallat <louis@louis-vallat.xyz> * Fixed the bad formatting Signed-off-by: Louis Vallat <louis@louis-vallat.xyz> * Changed sessionStorage name from sidebarUserPreferenceVisible to keepSidebarVisible Signed-off-by: Louis Vallat <louis@louis-vallat.xyz> * Renamed sidebar.userPreferenceVisibility() to sidebar.keepSidebarVisible() Signed-off-by: Louis Vallat <louis@louis-vallat.xyz> * Make it compile Co-authored-by: kamil4 <kamil.01482@iskra.name>
LycheeOrg · Nov 22, 2021 · a071305 · a071305
1 parent 63828eb
commit a071305
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/scripts/main/header.js b/scripts/main/header.js
@@ -60,8 +60,12 @@ header.bind = function () {
 		multiselect.bind();
 		lychee.load();
 	});
-	header.dom("#button_info_album").on(eventName, sidebar.toggle);
-	header.dom("#button_info").on(eventName, sidebar.toggle);
+	header.dom("#button_info_album").on(eventName, function () {
+		sidebar.toggle(true);
+	});
+	header.dom("#button_info").on(eventName, function () {
+		sidebar.toggle(true);
+	});
 	header.dom(".button--map-albums").on(eventName, function () {
 		lychee.gotoMap();
 	});
@@ -350,6 +354,7 @@ header.setMode = function (mode) {
 				);
 			} else if (album.isTagAlbum()) {
 				$("#button_info_album").show();
+				if (sidebar.keepSidebarVisible() && !visible.sidebar()) sidebar.toggle(false);
 				$("#button_move_album").hide();
 				$(".button_add, .header__divider", ".header__toolbar--album").hide();
 				tabindex.makeFocusable($("#button_info_album"));
@@ -371,6 +376,7 @@ header.setMode = function (mode) {
 				}
 			} else {
 				$("#button_info_album").show();
+				if (sidebar.keepSidebarVisible() && !visible.sidebar()) sidebar.toggle(false);
 				tabindex.makeFocusable($("#button_info_album"));
 				if (album.isUploadable()) {
 					$(

diff --git a/scripts/main/init.js b/scripts/main/init.js
@@ -116,7 +116,7 @@ $(document).ready(function () {
 		})
 		.bind(["i", "ContextMenu"], function () {
 			if (!visible.multiselect()) {
-				sidebar.toggle();
+				sidebar.toggle(true);
 				return false;
 			}
 		})

diff --git a/scripts/main/lychee.js b/scripts/main/lychee.js
@@ -435,7 +435,7 @@ lychee.load = function (autoplay = true) {
 
 			// Show Album -> it's below the map
 			if (visible.photo()) view.photo.hide();
-			if (visible.sidebar()) sidebar.toggle();
+			if (visible.sidebar()) sidebar.toggle(false);
 			if (album.json && albumID === album.json.id) {
 				view.album.title();
 			}
@@ -503,7 +503,7 @@ lychee.load = function (autoplay = true) {
 
 			// Show Album -> it's below the map
 			if (visible.photo()) view.photo.hide();
-			if (visible.sidebar()) sidebar.toggle();
+			if (visible.sidebar()) sidebar.toggle(false);
 			mapview.open();
 			lychee.footer_hide();
 		} else if (albumID == "search") {
@@ -519,7 +519,7 @@ lychee.load = function (autoplay = true) {
 				tabindex.makeUnfocusable(lychee.imageview);
 			}
 			if (visible.mapview()) mapview.close();
-			if (visible.sidebar() && album.isSmartID(albumID)) sidebar.toggle();
+			if (visible.sidebar() && album.isSmartID(albumID)) sidebar.toggle(false);
 			$("#sensitive_warning").hide();
 			if (album.json && albumID === album.json.id) {
 				view.album.title();
@@ -543,7 +543,7 @@ lychee.load = function (autoplay = true) {
 		photo.json = null;
 
 		// Hide sidebar
-		if (visible.sidebar()) sidebar.toggle();
+		if (visible.sidebar()) sidebar.toggle(false);
 
 		// Show Albums
 		if (visible.photo()) {

diff --git a/scripts/main/search.js b/scripts/main/search.js
@@ -69,7 +69,7 @@ search.find = function (term) {
 
 						setTimeout(() => {
 							if (visible.photo()) view.photo.hide();
-							if (visible.sidebar()) sidebar.toggle();
+							if (visible.sidebar()) sidebar.toggle(false);
 							if (visible.mapview()) mapview.close();
 
 							header.setMode("albums");

diff --git a/scripts/main/sidebar.js b/scripts/main/sidebar.js
@@ -107,7 +107,12 @@ sidebar.triggerSearch = function (search_string) {
 	lychee.goto("search/" + encodeURIComponent(search_string));
 };
 
-sidebar.toggle = function () {
+sidebar.keepSidebarVisible = function () {
+	let v = sessionStorage.getItem("keepSidebarVisible");
+	return v !== null ? v === "true" : false;
+};
+
+sidebar.toggle = function (is_user_initiated) {
 	if (visible.sidebar() || visible.sidebarbutton()) {
 		header.dom(".button--info").toggleClass("active");
 		lychee.content.toggleClass("content--sidebar");
@@ -116,6 +121,8 @@ sidebar.toggle = function () {
 		sidebar.dom().toggleClass("active");
 		photo.updateSizeLivePhotoDuringAnimation();
 
+		if (is_user_initiated) sessionStorage.setItem("keepSidebarVisible", visible.sidebar());
+
 		return true;
 	}
 

diff --git a/scripts/view/main.js b/scripts/view/main.js
@@ -172,7 +172,9 @@ $(document).ready(function () {
 	});
 
 	// Infobox
-	header.dom("#button_info").on("click", sidebar.toggle);
+	header.dom("#button_info").on("click", function () {
+		sidebar.toggle(true);
+	});
 
 	// Load photo
 	loadPhotoInfo(photoID);