+ draggable="${this.supportsNativeFileDrag()}">
@@ -2778,7 +2781,12 @@ class SFTPFileManager {
this.updatePaneStatus(pane);
}
- handleItemClick(e, pane, index) {
+ handleItemClick(e, pane, index, { ignoreSuppression = false } = {}) {
+ if (!ignoreSuppression && this.shouldSuppressItemClick(pane, index)) {
+ e.preventDefault?.();
+ e.stopPropagation?.();
+ return;
+ }
e.stopPropagation();
this.setActivePane(pane);
@@ -2809,6 +2817,11 @@ class SFTPFileManager {
}
handleItemDoubleClickEvent(e, pane, index) {
+ if (this.shouldSuppressItemClick(pane, index)) {
+ e.preventDefault?.();
+ e.stopPropagation?.();
+ return;
+ }
if (e.target?.closest?.('.fm-file-checkbox')) return;
e.preventDefault();
e.stopPropagation();
@@ -2877,6 +2890,43 @@ class SFTPFileManager {
return window.innerWidth < 768;
}
+ supportsNativeFileDrag() {
+ return typeof window.matchMedia !== 'function'
+ || !window.matchMedia('(pointer: coarse)').matches;
+ }
+
+ suppressItemClick(pane, index, duration = 800) {
+ this.suppressedItemClick = {
+ pane,
+ index,
+ until: Date.now() + duration,
+ };
+ }
+
+ shouldSuppressItemClick(pane, index) {
+ const suppressed = this.suppressedItemClick;
+ if (!suppressed) return false;
+ if (suppressed.until <= Date.now()) {
+ this.suppressedItemClick = null;
+ return false;
+ }
+ return suppressed.pane === pane && suppressed.index === index;
+ }
+
+ handleTouchItemTap(event, pane, index) {
+ const state = this.panes[pane];
+ const checkboxTapped = Boolean(event.target?.closest?.('.fm-file-checkbox'));
+ const file = index >= 0 ? state.files[index] : null;
+ if (!checkboxTapped && (index === -1 || file?.is_dir)) {
+ event.preventDefault?.();
+ event.stopPropagation?.();
+ this.setActivePane(pane);
+ this.handleItemDblClick(pane, index);
+ return;
+ }
+ this.handleItemClick(event, pane, index, { ignoreSuppression: true });
+ }
+
updateMobilePaneTabs(pane) {
document.querySelectorAll('.fm-pane-tab').forEach(tab => {
const active = tab.dataset.pane === pane;
@@ -2886,64 +2936,154 @@ class SFTPFileManager {
}
setupLongPress() {
+ let gesture = null;
let longPressTimer = null;
const longPressDuration = 500;
+ const movementTolerance = 10;
+
+ const clearLongPressTimer = () => {
+ if (longPressTimer) clearTimeout(longPressTimer);
+ longPressTimer = null;
+ };
+
+ const resetGesture = () => {
+ clearLongPressTimer();
+ gesture = null;
+ };
['left', 'right'].forEach(pane => {
const listEl = document.getElementById(`fm${this.capitalize(pane)}List`);
- listEl.addEventListener('touchstart', (e) => {
- const item = e.target.closest('.fm-file-item');
+ listEl.addEventListener('pointerdown', event => {
+ if (event.pointerType !== 'touch' || gesture) return;
+ const item = event.target.closest('.fm-file-item');
if (!item) return;
-
+ const index = parseInt(item.dataset.index);
+ gesture = {
+ pane,
+ index,
+ item,
+ pointerId: event.pointerId,
+ startX: event.clientX,
+ startY: event.clientY,
+ moved: false,
+ longPressed: false,
+ };
longPressTimer = setTimeout(() => {
- e.preventDefault();
- const index = parseInt(item.dataset.index);
+ if (!gesture || gesture.moved) return;
+ gesture.longPressed = true;
this.setActivePane(pane);
this.panes[pane].selected.clear();
- this.panes[pane].selected.add(index);
+ if (index >= 0) {
+ this.panes[pane].selected.add(index);
+ }
this.updateSelectionVisual(pane);
- this.showActionSheet();
+ this.suppressItemClick(pane, index);
+ this.showActionSheet(pane, index, {
+ gestureActive: true,
+ trigger: item.querySelector('.fm-file-checkbox'),
+ });
}, longPressDuration);
- }, { passive: false });
+ });
- listEl.addEventListener('touchend', () => {
- if (longPressTimer) {
- clearTimeout(longPressTimer);
- longPressTimer = null;
- }
+ listEl.addEventListener('pointermove', event => {
+ if (!gesture || gesture.pointerId !== event.pointerId) return;
+ const deltaX = Math.abs(event.clientX - gesture.startX);
+ const deltaY = Math.abs(event.clientY - gesture.startY);
+ if (Math.max(deltaX, deltaY) <= movementTolerance) return;
+ gesture.moved = true;
+ clearLongPressTimer();
});
- listEl.addEventListener('touchmove', () => {
- if (longPressTimer) {
- clearTimeout(longPressTimer);
- longPressTimer = null;
+ listEl.addEventListener('pointerup', event => {
+ if (!gesture || gesture.pointerId !== event.pointerId) return;
+ const completedGesture = gesture;
+ resetGesture();
+ if (completedGesture.moved) return;
+ if (completedGesture.longPressed) {
+ this.releaseActionSheetGesture();
+ return;
}
+ const releasedItem = event.target.closest('.fm-file-item');
+ if (releasedItem !== completedGesture.item) return;
+ this.handleTouchItemTap(event, pane, completedGesture.index);
+ this.suppressItemClick(pane, completedGesture.index);
+ });
+
+ listEl.addEventListener('pointercancel', () => {
+ const completedGesture = gesture;
+ resetGesture();
+ if (completedGesture?.longPressed) this.releaseActionSheetGesture();
});
});
}
- showActionSheet() {
+ showActionSheet(
+ pane = this.activePane,
+ index = null,
+ { gestureActive = false, trigger = null } = {},
+ ) {
const sheet = document.getElementById('fmActionSheet');
if (sheet) {
+ const state = this.panes[pane];
+ const selectedCount = state?.selected?.size || 0;
+ const targetPane = pane === 'left' ? 'right' : 'left';
+ const setDisabled = (action, disabled) => {
+ const button = sheet.querySelector(`[data-action="${action}"]`);
+ if (button) button.disabled = Boolean(disabled);
+ };
+ this.actionSheetIndex = index;
+ this.actionSheetTrigger = trigger || document.activeElement;
+ setDisabled('open', index === null || (index >= 0 && selectedCount !== 1));
+ setDisabled('download', selectedCount === 0 || !this.sourceCan(state, 'read'));
+ setDisabled('transfer', selectedCount === 0 || !this.canTransferBetweenPanes(pane, targetPane));
+ setDisabled('rename', selectedCount !== 1 || !this.sourceCan(state, 'rename'));
+ setDisabled('newfolder', !this.sourceCan(state, 'mkdir'));
+ setDisabled('delete', selectedCount === 0 || !this.sourceCan(state, 'delete'));
+ sheet.classList.toggle('gesture-active', gestureActive);
sheet.classList.add('visible');
+ sheet.removeAttribute('inert');
+ sheet.setAttribute('aria-hidden', 'false');
+ if (!gestureActive) {
+ sheet.querySelector('.fm-action-sheet-item:not(:disabled)')?.focus();
+ }
}
}
+ releaseActionSheetGesture() {
+ const sheet = document.getElementById('fmActionSheet');
+ if (!sheet?.classList.contains('visible')) return;
+ setTimeout(() => {
+ if (!sheet.classList.contains('visible')) return;
+ sheet.classList.remove('gesture-active');
+ sheet.querySelector('.fm-action-sheet-item:not(:disabled)')?.focus();
+ }, 150);
+ }
+
hideActionSheet() {
const sheet = document.getElementById('fmActionSheet');
+ const trigger = this.actionSheetTrigger;
if (sheet) {
sheet.classList.remove('visible');
+ sheet.classList.remove('gesture-active');
+ sheet.setAttribute('inert', '');
+ sheet.setAttribute('aria-hidden', 'true');
}
+ this.actionSheetIndex = null;
+ this.actionSheetTrigger = null;
+ if (trigger?.isConnected !== false) trigger?.focus?.();
}
handleActionSheetAction(action) {
+ const actionSheetIndex = this.actionSheetIndex;
this.hideActionSheet();
switch (action) {
case 'open':
const state = this.panes[this.activePane];
- if (state.selected.size === 1) {
+ if (Number.isInteger(actionSheetIndex)) {
+ this.handleItemDblClick(this.activePane, actionSheetIndex);
+ } else if (state.selected.size === 1) {
const index = Array.from(state.selected)[0];
this.handleItemDblClick(this.activePane, index);
}
diff --git a/templates/admin.html b/templates/admin.html
index 236f6cc..5a5ebdb 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -448,7 +448,7 @@
Final destru
{% if not embedded %}
-
+
diff --git a/templates/change_password.html b/templates/change_password.html
index f45793e..7d5ee05 100644
--- a/templates/change_password.html
+++ b/templates/change_password.html
@@ -119,7 +119,7 @@ Change Password