diff --git a/src/webui/www/private/confirmdeletion.html b/src/webui/www/private/confirmdeletion.html index 34334ebd4..60aa45f16 100644 --- a/src/webui/www/private/confirmdeletion.html +++ b/src/webui/www/private/confirmdeletion.html @@ -11,6 +11,9 @@ 'use strict'; window.addEvent('domready', function() { + const isDeletingFiles = (new URI().getData('deleteFiles') === "true"); + $('deleteFromDiskCB').checked = isDeletingFiles; + const hashes = new URI().getData('hashes').split('|'); $('cancelBtn').focus(); $('cancelBtn').addEvent('click', function(e) { diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js index d30967b45..4600f40fa 100644 --- a/src/webui/www/private/scripts/client.js +++ b/src/webui/www/private/scripts/client.js @@ -1225,6 +1225,10 @@ new Keyboard({ 'delete': function(event) { deleteFN(); event.preventDefault(); + }, + 'shift+delete': (event) => { + deleteFN(true); + event.preventDefault(); } } }).activate(); diff --git a/src/webui/www/private/scripts/mocha-init.js b/src/webui/www/private/scripts/mocha-init.js index fed0a579b..51b345b55 100644 --- a/src/webui/www/private/scripts/mocha-init.js +++ b/src/webui/www/private/scripts/mocha-init.js @@ -376,14 +376,14 @@ const initializeWindows = function() { } }; - deleteFN = function() { + deleteFN = function(deleteFiles = false) { const hashes = torrentsTable.selectedRowsIds(); if (hashes.length) { new MochaUI.Window({ id: 'confirmDeletionPage', title: "QBT_TR(Deletion confirmation)QBT_TR[CONTEXT=confirmDeletionDlg]", loadMethod: 'iframe', - contentURL: 'confirmdeletion.html?hashes=' + hashes.join("|"), + contentURL: ('confirmdeletion.html?hashes=' + hashes.join("|") + '&deleteFiles=' + deleteFiles), scrollbars: false, resizable: false, maximizable: false,