From ba3e7ce2cd30504fae0c374fefd685b4dceaae8a Mon Sep 17 00:00:00 2001
From: Al Brookbanks <al@brooky.com>
Date: Fri, 15 Mar 2024 14:57:58 +0000
Subject: [PATCH] #3413 - remember location

---
 admin/skins/default/js/admin.js                     | 10 +++++++++-
 admin/skins/default/templates/filemanager.index.php |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/admin/skins/default/js/admin.js b/admin/skins/default/js/admin.js
index 6df23a1da..fa3beac4e 100644
--- a/admin/skins/default/js/admin.js
+++ b/admin/skins/default/js/admin.js
@@ -1176,8 +1176,16 @@ $('a.add, a.inline-add, input[type="button"].add').on("click", function() {
             for (j = 0; j < a.length; j++) updateAddressValues(a[j], s, e);
         else updateAddressValues(i, s, e)
 }),
+$(".fm_location").on("click", function() {
+    localStorage.setItem('fm_folder_href', $(this).attr('href'))
+});
 $(".choose_option_img").on("click", function(a) {
-    var opnr = window.open('?_g=filemanager&mode=fck&source=options','chooser','toolbar=no,menubar=no,width=600,height=600');
+    var filemanager_path = '?_g=filemanager&mode=fck&source=options';
+    var fm_folder_href = localStorage.getItem('fm_folder_href');
+    if(fm_folder_href) {
+        filemanager_path = fm_folder_href;
+    }
+    var opnr = window.open(filemanager_path,'chooser','toolbar=no,menubar=no,width=600,height=600');
     var selector = $(this);
     var assign_id = selector.attr("rel");
     window.addEventListener('message', function(event) {
diff --git a/admin/skins/default/templates/filemanager.index.php b/admin/skins/default/templates/filemanager.index.php
index b41aa6f1e..3caff1bb0 100755
--- a/admin/skins/default/templates/filemanager.index.php
+++ b/admin/skins/default/templates/filemanager.index.php
@@ -25,13 +25,13 @@
 		<div id="fm-wrapper" class="{if $FILMANAGER_MODE == FileManager::FM_FILETYPE_IMG}images{else}digital{/if}" style="overflow:hidden;">
 			{if $FOLDER_PARENT}
 			<div>
-				<a href="{$FOLDER_PARENT}"><i class="fa fa-arrow-left" aria-hidden="true"></i> {$LANG.filemanager.parent_directory}</a>
+				<a href="{$FOLDER_PARENT}" class="fm_location"><i class="fa fa-arrow-left" aria-hidden="true"></i> {$LANG.filemanager.parent_directory}</a>
 			</div>
 			{/if}
 			{if isset($FOLDERS)}
 			{foreach from=$FOLDERS item=folder}
 			<div {if $FILMANAGER_MODE == FileManager::FM_FILETYPE_IMG}class="fm-item folder {$FM_SIZE}"{/if}>
-			{if $FILMANAGER_MODE == FileManager::FM_FILETYPE_IMG}<a href="{$folder.link}" class="thumbnail"><img src="{$SKIN_VARS.admin_folder}/skins/default/images/folder_large.png"/></a>{/if}
+			{if $FILMANAGER_MODE == FileManager::FM_FILETYPE_IMG}<a href="{$folder.link}" class="thumbnail fm_folder fm_location"><img src="{$SKIN_VARS.admin_folder}/skins/default/images/folder_large.png" /></a>{/if}
 			<span class="actions">
 			{if NOT is_null($folder.delete)}
 			{if $FILMANAGER_MODE == FileManager::FM_FILETYPE_IMG}<input type="checkbox" value="{$folder.value}" class="multi_delete" name="multi_delete[]">{/if}