Merge pull request #1684 from mercihabam/fix-move-dropdown

fix(frontend): adjust move/copy dropdown content alignment and fix expand action not working on move action when copy dropdown was not opened beforehand

Author: kroky

modules/imap/site.css

@@ -387,6 +387,12 @@
   display: flex;
   flex-direction: column;
 }
+.move_to_location .folders .inner_list li {
+  flex-direction: row;
+}
+.move_to_location .folders li.m-has-children {
+  flex-direction: column;
+}
 /* .imap_keyword, .imap_sort, .imap_filter { font-size: 75%; float: left; margin-top: 8px; } */
 .imap_keyword {
   width: 120px;

modules/imap/site.js

@@ -958,7 +958,7 @@ var imap_move_copy = function(e, action, context) {
     }
     folders.prepend('<div class="move_to_title">'+label+'<a class="close_move_to close" href="#" aria-label="Close"><span aria-hidden="true">&times;</span></a></div>');
     $(move_to).html(folders.html());
-    $('.imap_move_folder_link', move_to).on("click", function() { return expand_imap_move_to_folders($(this).data('target'), context); });
+    $('.imap_move_folder_link', move_to).on("click", function() { return expand_imap_move_to_folders($(this).data('target'), context, move_to); });
     $('a', move_to).not('.imap_move_folder_link').not('.close_move_to').off('click');
     $('a', move_to).not('.imap_move_folder_link').not('.close_move_to').on("click", function() { imap_perform_move_copy($(this).data('id'), context); return false; });
     $('.move_to_type').val(action);
@@ -1055,31 +1055,30 @@ var imap_perform_move_copy = function(dest_id, context, action = null) {
     }
 };
 
-var expand_imap_move_to_mailbox = function(res, context) {
+var expand_imap_move_to_mailbox = function(res, context, move_to) {
     if (res.imap_expanded_folder_path) {
-        var move_to = $('.move_to_location');
         var folders = $(res.imap_expanded_folder_formatted);
         folders.find('.manage_folders_li').remove();
-        $('.'+Hm_Utils.clean_selector(res.imap_expanded_folder_path), $('.move_to_location')).append(folders);
+        $('.'+Hm_Utils.clean_selector(res.imap_expanded_folder_path), move_to).append(folders);
         $('.imap_folder_link', move_to).addClass('imap_move_folder_link').removeClass('imap_folder_link');
         $('.imap_move_folder_link', move_to).off('click');
-        $('.imap_move_folder_link', move_to).on("click", function() { return expand_imap_move_to_folders($(this).data('target'), context); });
+        $('.imap_move_folder_link', move_to).on("click", function() { return expand_imap_move_to_folders($(this).data('target'), context, move_to); });
         $('a', move_to).not('.imap_move_folder_link').off('click');
         $('a', move_to).not('.imap_move_folder_link').on("click", function() { imap_perform_move_copy($(this).data('id'), context); return false; });
     }
 };
 
-var expand_imap_move_to_folders = function(path, context) {
+var expand_imap_move_to_folders = function(path, context, move_to) {
     var detail = Hm_Utils.parse_folder_path(path, 'imap');
-    var list = $('.imap_'+detail.server_id+'_'+Hm_Utils.clean_selector(detail.folder), $('.move_to_location'));
+    var list = $('.imap_'+detail.server_id+'_'+Hm_Utils.clean_selector(detail.folder), $(move_to));
     if ($('li', list).length === 0) {
         $('.expand_link', list).html('<i class="bi bi-file-minus-fill"></i>');
         if (detail) {
             Hm_Ajax.request(
                 [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_folder_expand'},
                 {'name': 'imap_server_id', 'value': detail.server_id},
                 {'name': 'folder', 'value': detail.folder}],
-                function (res) { expand_imap_move_to_mailbox(res, context); }
+                function (res) { expand_imap_move_to_mailbox(res, context, move_to); }
             );
         }
     }