From 72815f842e9f0b41e2ce689cb8a78daa99ec28d6 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 13 Feb 2024 18:25:17 +0100
Subject: [PATCH] Small bugfix for the folder editor popup

---
 dev/Model/FolderCollection.js                               | 6 ------
 dev/View/Popup/Folder.js                                    | 6 +++---
 .../v/0.0.0/app/templates/Views/User/PopupsFolder.html      | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js
index 10ae62a2a..501543518 100644
--- a/dev/Model/FolderCollection.js
+++ b/dev/Model/FolderCollection.js
@@ -485,10 +485,6 @@ export class FolderModel extends AbstractModel {
 		showScreenPopup(FolderPopupView, [this]);
 	}
 
-	unedit() {
-		this.editing(false);
-	}
-
 	rename() {
 		const folder = this,
 			nameToEdit = folder.nameForEdit().trim();
@@ -520,8 +516,6 @@ export class FolderModel extends AbstractModel {
 						+ '.\n' + error.message);
 				});
 		}
-
-		folder.editing(false);
 	}
 
 	/**
diff --git a/dev/View/Popup/Folder.js b/dev/View/Popup/Folder.js
index 10b0f3e60..eb4f13974 100644
--- a/dev/View/Popup/Folder.js
+++ b/dev/View/Popup/Folder.js
@@ -13,8 +13,8 @@ export class FolderPopupView extends AbstractViewPopup {
 		this.ACL = ko.observableArray();
 	}
 
-	onClose() {
-		this.folder().unedit();
+	afterHide() {
+		this.folder().editing(false);
 	}
 
 	submitForm(form) {
@@ -32,7 +32,7 @@ export class FolderPopupView extends AbstractViewPopup {
 		}, {
 			folder: folder.fullName
 		});
-		!folder.type() && folder.exists && folder.selectable() && folder.editing(true);
+		folder.editing(!folder.type() && folder.exists && folder.selectable());
 		this.folder(folder);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolder.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolder.html
index 0d932518c..5b198593a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolder.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolder.html
@@ -8,7 +8,7 @@
 			<label data-i18n="GLOBAL/NAME"></label>
 			<input name="folder" type="text"
 				autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-				required="" data-bind="textInput: nameForEdit, hasfocus: editing">
+				required="" data-bind="textInput: nameForEdit">
 		</div>
 		<div class="control-group">
 			<label data-i18n="POPUPS_FILTER/SELECT_FIELD_SIZE"></label>