progress & cleanup

1 files changed, 9 insertions, 9 deletions

diff --git a/keys.js b/keys.js
index 8ef23d3..6d69377 100644
--- a/keys.js
+++ b/keys.js
@@ -1,4 +1,4 @@
-window.rcmail && window.rcmail.addEventListener('init', function () {
+window.rcmail && window.rcmail.addEventListener('init', function() {
     if (rcmail.env.task === 'settings'
         && rcmail.env.action === 'plugin.inbox_keys') {
         if (rcmail.gui_objects.keyslist) {
@@ -19,30 +19,30 @@ window.rcmail && window.rcmail.addEventListener('init', function () {
     }
 });
 
-rcube_webmail.prototype.inbox_keys_select = function (list) {
+rcube_webmail.prototype.inbox_keys_select = function(list) {
     this.enable_command('plugin.inbox_keys_delete', list.get_selection().length > 0);
 };
 
-rcube_webmail.prototype.inbox_keys_generate = function () {
-    this.inbox_keys_loadframe('&_action=plugin.inbox_keys_generate');
+rcube_webmail.prototype.inbox_keys_generate = function() {
+    this.goto_url('plugin.inbox_keys_generate');
 };
 
-rcube_webmail.prototype.inbox_keys_import = function () {
-    this.inbox_keys_loadframe('&_action=plugin.inbox_keys_import');
+rcube_webmail.prototype.inbox_keys_import = function() {
+    this.goto_url('plugin.inbox_keys_import');
 };
 
-rcube_webmail.prototype.inbox_keys_delete = function () {
+rcube_webmail.prototype.inbox_keys_delete = function() {
     var keys = this.inbox_keys_list.get_selection();
     if (!keys.length) return;
 
     this.confirm_dialog(
         this.get_label('inbox_settings.confirm_delete_key'),
         'delete',
-        function (_evt, ref) {
+        function(_evt, ref) {
             var lock = ref.display_message(
                 ref.get_label('inbox_settings.deleting_key', 'loading'));
+            ref.addEventListener('responseafter', () => ref.reload());
             ref.http_post('plugin.inbox_keys_delete', {keys}, lock);
-            ref.reload();
         });
 };