clipboard: use ctrl+c to confirm copy

This will provide easy to use flow for the user: ctrl+c has to be clicked 3 times to copy, download and confirm Signed-off-by: Szymon Kłos <[email protected]> Change-Id: I745963744cdff552c37f7a5ffee5c0f737fb67ba
CollaboraOnline · Oct 6, 2023 · e14897b · e14897b
1 parent c00a9b5
commit e14897b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/browser/src/control/Control.DownloadProgress.js b/browser/src/control/Control.DownloadProgress.js
@@ -53,7 +53,7 @@ L.Control.DownloadProgress = L.Control.extend({
 		var modalId = 'large_copy_paste_warning';
 
 		var msg = this._getLargeCopyPasteMessage();
-		var buttonText = _('Download') + ' (Alt + C)'; // TODO: on Mac Alt == Option
+		var buttonText = _('Download') + ' (Ctrl + C)'; // TODO: on Mac Ctrl == Command
 
 		if (inSnackbar) {
 			this._map.uiManager.showSnackbar(
@@ -98,7 +98,7 @@ L.Control.DownloadProgress = L.Control.extend({
 	_showDownloadComplete: function (inSnackbar) {
 		var modalId = 'copy_paste_complete';
 		var msg = _('Download completed and ready to be copied to clipboard.');
-		var buttonText = _('Copy') + ' (Alt + C)'; // TODO: on Mac Alt == Option
+		var buttonText = _('Copy') + ' (Ctrl + C)'; // TODO: on Mac Ctrl == Command?
 
 		if (inSnackbar) {
 			this._map.uiManager.showSnackbar(msg, buttonText,
@@ -115,7 +115,7 @@ L.Control.DownloadProgress = L.Control.extend({
 
 	_setupKeyboardShortcutForElement: function (eventTargetId, buttonId) {
 		var keyDownCallback = function(e) {
-			if (e.altKey && e.keyCode === 67 /*C*/) {
+			if (!e.altKey && !e.shiftKey && e.ctrlKey && e.key === 'c') { // CTRL + C
 				document.getElementById(buttonId).click();
 				e.preventDefault();
 			}