From ea77fa4e7a2cb3f143557e1d80d862f840f29747 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 18 Jun 2017 21:57:43 +0800
Subject: [PATCH] feat(messages): press ESC close message reply detail view

---
 modules/core/client/app/trans-string-en.js                | 7 ++++---
 modules/core/client/app/trans-string-zh.js                | 7 ++++---
 .../client/controllers/messages.client.controller.js      | 6 ++++++
 modules/messages/client/views/box.client.view.html        | 8 ++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 33af8d52..79397070 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -464,9 +464,6 @@
     GET_INVITATIONS_ERROR: 'Get invitations failed',
     BUTTON_INVITE: 'Send',
     BUTTON_SEARCH: 'Search',
-    BUTTON_DELETE: '　Delete　',
-    BUTTON_CLOSE: '　Close　',
-    BUTTON_REPLY: '　Reply　',
     INPUT_EMAIL: 'email',
     SEND_INVITE_SUCCESSFULLY: 'Send invitation successfully',
     SEND_INVITE_ERROR: 'Send invitation failed',
@@ -494,6 +491,10 @@
       INFO_SEND_AT: 'at',
       NEW_MSG: 'New messages'
     },
+    BUTTON_MESSAGE_DELETE: '　Delete　',
+    BUTTON_MESSAGE_CLOSE: ' Close (esc) ',
+    BUTTON_MESSAGE_REPLY: '　Reply　',
+
     MESSAGE_TYPE_USER: 'User message',
     MESSAGE_TYPE_SYSTEM: 'System message',
     MESSAGE_TYPE_ADVERT: 'Advert message',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 41e1033e..5cc87a0c 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -464,9 +464,6 @@
     GET_INVITATIONS_ERROR: '获取邀请列表失败',
     BUTTON_INVITE: '发送',
     BUTTON_SEARCH: '搜索',
-    BUTTON_DELETE: '　删除　',
-    BUTTON_CLOSE: '　关闭　',
-    BUTTON_REPLY: '　回复　',
     INPUT_EMAIL: '邮箱地址',
     SEND_INVITE_SUCCESSFULLY: '发送邀请成功',
     SEND_INVITE_ERROR: '发送邀请失败',
@@ -494,6 +491,10 @@
       INFO_SEND_AT: '于',
       NEW_MSG: '条未读消息'
     },
+    BUTTON_MESSAGE_DELETE: '　删除　',
+    BUTTON_MESSAGE_CLOSE: ' 关闭 (esc) ',
+    BUTTON_MESSAGE_REPLY: '　回复　',
+
     MESSAGE_TYPE_USER: '用户消息',
     MESSAGE_TYPE_SYSTEM: '系统消息',
     MESSAGE_TYPE_ADVERT: '广告推送',
diff --git a/modules/messages/client/controllers/messages.client.controller.js b/modules/messages/client/controllers/messages.client.controller.js
index 99cb9441..b8049c76 100644
--- a/modules/messages/client/controllers/messages.client.controller.js
+++ b/modules/messages/client/controllers/messages.client.controller.js
@@ -16,6 +16,12 @@
     vm.messageFields = {};
     vm.deleteList = [];
 
+    $(document).on('keydown', function (e) {
+      console.log(e.keyCode);
+      if (e.keyCode === 27) { // ESC
+        vm.hideMessage();
+      }
+    });
     /**
      * If user is not signed in then redirect back home
      */
diff --git a/modules/messages/client/views/box.client.view.html b/modules/messages/client/views/box.client.view.html
index b804c958..3c06f808 100644
--- a/modules/messages/client/views/box.client.view.html
+++ b/modules/messages/client/views/box.client.view.html
@@ -76,7 +76,7 @@
                     next-text="{{ 'PAGE_TEXT_NEXT' | translate}}" last-text="{{ 'PAGE_TEXT_LAST' | translate}}">
                 </ul>
                 <div class="pull-right margin-top-20">
-                    <button class="btn btn-success" ng-click="vm.deleteSelected()">{{ 'BUTTON_DELETE' | translate }}</button>
+                    <button class="btn btn-success" ng-click="vm.deleteSelected()">{{ 'BUTTON_MESSAGE_DELETE' | translate }}</button>
                 </div>
             </div>
         </div>
@@ -116,9 +116,9 @@
         <div class="bottom-control">
             <textarea class="form-control reply-textarea" id="reply-content" name="reply-content"
                       ng-model="vm.replyContent" autofocus></textarea>
-            <button class="btn btn-default" ng-click="vm.hideMessage();">{{ 'BUTTON_CLOSE' | translate }}</button>
-            <button class="btn btn-default" ng-click="vm.delete(vm.selectedMessage);">{{ 'BUTTON_DELETE' | translate }}</button>
-            <button class="btn btn-success pull-right" ng-disabled="!vm.replyContent" ng-click="vm.replyMessage(vm.selectedMessage);">{{ 'BUTTON_REPLY' | translate }}</button>
+            <button class="btn btn-default" ng-click="vm.hideMessage();">{{ 'BUTTON_MESSAGE_CLOSE' | translate }}</button>
+            <button class="btn btn-default" ng-click="vm.delete(vm.selectedMessage);">{{ 'BUTTON_MESSAGE_DELETE' | translate }}</button>
+            <button class="btn btn-success pull-right" ng-disabled="!vm.replyContent" ng-click="vm.replyMessage(vm.selectedMessage);">{{ 'BUTTON_MESSAGE_REPLY' | translate }}</button>
         </div>
     </div>
 </section>