mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-24 08:43:27 +00:00
Code Issues Releases Wiki Activity

Use id when handling hotkeys for specific dialogs

Browse source 
Identifying a dialog by it's header title is kinda dirty and now we use
the dialogs id instead. We also check if the dialog is visible before executing
the hotkey action.
This commit is contained in:
Sven Depondt 2017-07-28 22:32:18 +02:00
parent a52ef89161
commit 0978dbf890
2 changed files with 60 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
web/javascript/dialog.js
View file

@ -41,6 +41,11 @@ Dialog.prototype = {
*
*--------------------------------------------*/
executeCallback: function () {
this._callback();
dialog.hideDialog();
},
hideDialog: function () {
$('body.dialog_showing').removeClass('dialog_showing');
this._container.hide();
@ -48,14 +53,16 @@ Dialog.prototype = {
transmission.updateButtonStates();
},
isVisible: function () {
return this._container.is(':visible');
},
onCancelClicked: function (event) {
event.data.dialog.hideDialog();
},
onConfirmClicked: function (event) {
var dialog = event.data.dialog;
dialog._callback();
dialog.hideDialog();
event.data.dialog.executeCallback();
},
/*--------------------------------------------

77
web/javascript/transmission.js
View file

@ -505,9 +505,7 @@ Transmission.prototype = {
}
if (o_key || u_key) {
$('body').addClass('open_showing');
this.uploadTorrentFile();
this.updateButtonStates();
this.openTorrentClicked(ev);
handled = true;
}
@ -527,36 +525,61 @@ Transmission.prototype = {
}
}
if (enter_key) {
// check if remove dialog
if ($('.dialog_heading:visible').text().match("Remove") != null) {
$("#dialog_confirm_button").click();
handled = true;
}
// check if upload torrent dialog
if ($('.dialog_heading:visible').text() == "Upload Torrent Files") {
this.confirmUploadClicked();
handled = true;
}
// check if location dialog
if ($('.dialog_heading:visible').text() == "Set Location") {
this.confirmMoveClicked();
handled = true;
}
}
if (slash_key) {
this.showHotkeysDialog();
handled = true;
}
if (enter_key) {
// handle other dialogs
if (dialog && dialog.isVisible()) {
dialog.executeCallback();
handled = true;
}
// handle upload dialog
if ($('#upload_container').is(':visible')) {
this.confirmUploadClicked();
handled = true;
}
// handle move dialog
if ($('#move_container').is(':visible')) {
this.confirmMoveClicked();
handled = true;
}
// handle rename dialog
if ($('#rename_container').is(':visible')) {
this.confirmRenameClicked();
handled = true;
}
}
if (esc_key) {
this.hideMoveDialog();
this.hideUploadDialog();
dialog.hideDialog();
handled = true;
// handle other dialogs
if (dialog && dialog.isVisible()) {
dialog.hideDialog();
handled = true;
}
// handle upload dialog
if ($('#upload_container').is(':visible')) {
this.hideUploadDialog();
handled = true;
}
// handle move dialog
if ($('#move_container').is(':visible')) {
this.hideMoveDialog();
handled = true;
}
// handle rename dialog
if ($('#rename_container').is(':visible')) {
this.hideRenameDialog();
handled = true;
}
}
if ((up_key || dn_key) && rows.length) {