update to version 4.3.6 (#1143)

* update to version 4.3.6
* Sync recent front-end commits

Co-authored-by: Matthias Nagel <[email protected]>

.github/workflows/Build-Dist.yml

@@ -5,9 +5,13 @@ on:
   push:
     paths-ignore:
       - '**/*.md'
+      - 'public/dist/*.js'
+      - 'public/dist/**/*.js'
   pull_request:
     paths-ignore:
       - '**/*.md'
+      - 'public/dist/*.js'
+      - 'public/dist/**/*.js'
 
 jobs:
   tests:

.github/workflows/Build-Full-SQL.yml

@@ -5,9 +5,13 @@ on:
   push:
     paths-ignore:
       - '**/*.md'
+      - 'public/dist/*.js'
+      - 'public/dist/**/*.js'
   pull_request:
     paths-ignore:
       - '**/*.md'
+      - 'public/dist/*.js'
+      - 'public/dist/**/*.js'
 
 jobs:
   tests:

.gitignore

@@ -42,6 +42,7 @@ Lychee/*
 _ide*
 
 .php_cs.cache
+.php-cs-fixer.cache
 
 *.log
 package-lock.json

database/migrations/2021_11_16_162058_bump_version040306.php

@@ -0,0 +1,27 @@
+<?php
+
+use App\Models\Configs;
+use Illuminate\Database\Migrations\Migration;
+
+class BumpVersion040306 extends Migration
+{
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Configs::where('key', 'version')->update(['value' => '040306']);
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Configs::where('key', 'version')->update(['value' => '040305']);
+	}
+}

makefile

@@ -104,15 +104,15 @@ formatting:
 	fi
 
 gen_minor:
-	php gen_release.php
+	php scripts/gen_release.php
 	git add database
 	git add version.md
 
 release_minor: gen_minor
 	git commit -S -m "bump to version $(shell cat version.md)"
 
 gen_major:
-	php gen_release.php major
+	php scripts/gen_release.php major
 	git add database
 	git add version.md
 

public/dist/view.js

@@ -368,7 +368,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);
@@ -899,8 +901,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();
 	});
@@ -1161,20 +1167,29 @@ header.setMode = function (mode) {
 				tabindex.makeUnfocusable($("#button_nsfw_album, #button_info_album, #button_visibility_album, #button_sharing_album_users, #button_move_album"));
 			} else if (album.isTagAlbum()) {
 				$("#button_info_album").show();
-				$("#button_nsfw_album, #button_move_album").hide();
+				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"));
-				tabindex.makeUnfocusable($("#button_nsfw_album, #button_move_album"));
+				tabindex.makeUnfocusable($("#button_move_album"));
 				tabindex.makeUnfocusable($(".button_add, .header__divider", ".header__toolbar--album"));
 				if (album.isUploadable()) {
-					$("#button_visibility_album, #button_sharing_album_users, #button_trash_album").show();
-					tabindex.makeFocusable($("#button_visibility_album, #button_sharing_album_users, #button_trash_album"));
+					$("#button_nsfw_album, #button_visibility_album, #button_sharing_album_users, #button_trash_album").show();
+					tabindex.makeFocusable($("#button_nsfw_album, #button_visibility_album, #button_sharing_album_users, #button_trash_album"));
+					if ($("#button_visibility_album").is(":hidden")) {
+						// This can happen with narrow screens.  In that
+						// case we re-enable the add button which will
+						// contain the overflow items.
+						$(".button_add, .header__divider", ".header__toolbar--album").show();
+						tabindex.makeFocusable($(".button_add, .header__divider", ".header__toolbar--album"));
+					}
 				} else {
-					$("#button_visibility_album, #button_sharing_album_users, #button_trash_album").hide();
-					tabindex.makeUnfocusable($("#button_visibility_album, #button_sharing_album_users, #button_trash_album"));
+					$("#button_nsfw_album, #button_visibility_album, #button_sharing_album_users, #button_trash_album").hide();
+					tabindex.makeUnfocusable($("#button_nsfw_album, #button_visibility_album, #button_sharing_album_users, #button_trash_album"));
 				}
 			} else {
 				$("#button_info_album").show();
+				if (sidebar.keepSidebarVisible() && !visible.sidebar()) sidebar.toggle(false);
 				tabindex.makeFocusable($("#button_info_album"));
 				if (album.isUploadable()) {
 					$("#button_nsfw_album, #button_trash_album, #button_move_album, #button_visibility_album, #button_sharing_album_users, .button_add, .header__divider", ".header__toolbar--album").show();
@@ -1472,7 +1487,12 @@ sidebar.triggerSearch = function (search_string) {
 	lychee.goto("search/" + encodeURIComponent(search_string));
 };
 
-sidebar.toggle = function () {
+sidebar.keepSidebarVisible = function () {
+	var 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");
@@ -1481,6 +1501,8 @@ sidebar.toggle = function () {
 		sidebar.dom().toggleClass("active");
 		photo.updateSizeLivePhotoDuringAnimation();
 
+		if (is_user_initiated) sessionStorage.setItem("keepSidebarVisible", visible.sidebar());
+
 		return true;
 	}
 

version.md

@@ -1 +1 @@
-4.3.5
+4.3.6