From 5f5e97bb40c014de2f18923ec80d6a7c8d4f242d Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 15 Feb 2018 11:20:12 +0100
Subject: [PATCH] Improved token copy dialog.

---
 .../app/controllers/_profile/token_access.coffee            | 2 +-
 app/assets/javascripts/app/lib/bootstrap/modal.js           | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_profile/token_access.coffee b/app/assets/javascripts/app/controllers/_profile/token_access.coffee
index fdb8dba52..7bbd67800 100644
--- a/app/assets/javascripts/app/controllers/_profile/token_access.coffee
+++ b/app/assets/javascripts/app/controllers/_profile/token_access.coffee
@@ -127,7 +127,7 @@ class Create extends App.ControllerModal
         App.view('profile/token_access_created')(
           name: ui.newToken.name
         )
-      post: ->
+      onShown: ->
         @$('.js-select').on('click', ui.selectAll)
       onCancel: ->
         @close()
diff --git a/app/assets/javascripts/app/lib/bootstrap/modal.js b/app/assets/javascripts/app/lib/bootstrap/modal.js
index 4e202316c..08345d217 100644
--- a/app/assets/javascripts/app/lib/bootstrap/modal.js
+++ b/app/assets/javascripts/app/lib/bootstrap/modal.js
@@ -152,8 +152,10 @@
       $(window).on('keydown.dismiss.bs.modal', $.proxy(function (e) {
         e.which == 27 && this.hide()
         // 2016-08-21: added event to capture esc for cancel
-        e = $.Event('dismiss.bs.modal')
-        this.$element.trigger(e)
+        if (e.which == 27) {
+          e = $.Event('dismiss.bs.modal')
+          this.$element.trigger(e)
+        }
         // -
       }, this))
     } else if (!this.isShown) {