From 2647a22c91e3dfc3b450b5223796a2a64ab6d780 Mon Sep 17 00:00:00 2001
From: Fornax <wim@fornaxian.tech>
Date: Mon, 29 May 2023 22:15:46 +0200
Subject: [PATCH] Fix share button

---
 svelte/src/filesystem/Toolbar.svelte                   | 10 +++++-----
 svelte/src/filesystem/filemanager/FileManager.svelte   |  9 ++++++++-
 .../src/filesystem/upload_widget/UploadWidget.svelte   |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/svelte/src/filesystem/Toolbar.svelte b/svelte/src/filesystem/Toolbar.svelte
index cde8fe3..7b0d009 100644
--- a/svelte/src/filesystem/Toolbar.svelte
+++ b/svelte/src/filesystem/Toolbar.svelte
@@ -49,7 +49,7 @@ const copy_link = () => {
 }
 let share = async () => {
 	if (share_url === "") {
-		edit_window.edit(state.base, "share", true)
+		edit_window.edit(state.base, true, "share")
 		return
 	}
 
@@ -111,12 +111,12 @@ let share = async () => {
 		<button id="btn_copy" class="toolbar_button" on:click={copy_link} class:button_highlight={link_copied}>
 			<i class="icon">content_copy</i> <u>C</u>opy Link
 		</button>
-
-		<button on:click={share} class="toolbar_button" class:button_highlight={sharebar_visible}>
-			<i class="icon">share</i> Share
-		</button>
 	{/if}
 
+	<button on:click={share} class="toolbar_button" class:button_highlight={sharebar_visible}>
+		<i class="icon">share</i> Share
+	</button>
+
 	<button on:click={() => details_visible = !details_visible} class="toolbar_button" class:button_highlight={details_visible}>
 		<i class="icon">help</i> Deta<u>i</u>ls
 	</button>
diff --git a/svelte/src/filesystem/filemanager/FileManager.svelte b/svelte/src/filesystem/filemanager/FileManager.svelte
index 93607cc..736c716 100644
--- a/svelte/src/filesystem/filemanager/FileManager.svelte
+++ b/svelte/src/filesystem/filemanager/FileManager.svelte
@@ -44,6 +44,10 @@ const navigate_up = () => {
 		fs_navigator.navigate(state.path[state.path.length-2].path, true)
 	}
 }
+const navigate_back = () => {
+	creating_dir = false
+	history.back()
+}
 
 const delete_selected = () => {
 	if (mode !== "selecting") {
@@ -120,9 +124,12 @@ onMount(() => {
 <div class="container">
 	<div class="width_container">
 		<div class="toolbar">
-			<button on:click={navigate_up} disabled={state.path.length <= 1} title="Back">
+			<button on:click={navigate_back} title="Back">
 				<i class="icon">arrow_back</i>
 			</button>
+			<button on:click={navigate_up} disabled={state.path.length <= 1} title="Up">
+				<i class="icon">north</i>
+			</button>
 			<button on:click={fs_navigator.reload()} title="Refresh directory listing">
 				<i class="icon">refresh</i>
 			</button>
diff --git a/svelte/src/filesystem/upload_widget/UploadWidget.svelte b/svelte/src/filesystem/upload_widget/UploadWidget.svelte
index 561238f..0050ef8 100644
--- a/svelte/src/filesystem/upload_widget/UploadWidget.svelte
+++ b/svelte/src/filesystem/upload_widget/UploadWidget.svelte
@@ -27,7 +27,7 @@ let task_id_counter = 0
 export const upload_files = async files => {
 	if (files.length === 0) {
 		return
-	}else if (fs_state.base.type !== "dir") {
+	} else if (fs_state.base.type !== "dir") {
 		alert("Can only upload to directory")
 		return
 	}
@@ -42,7 +42,7 @@ export const upload_file = async file => {
 	if (fs_state.base.type !== "dir") {
 		alert("Can only upload to directory")
 		return
-	}else if (file.type === "" && file.size === 0) {
+	} else if (file.type === "" && file.size === 0) {
 		return
 	}