From f2fa7a39beee0586e5c8a8840d1532913895ef4b Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 1 Sep 2015 16:37:54 -0400
Subject: [PATCH] FEATURE: Use shift+Z twice to log out

---
 .../discourse/lib/keyboard-shortcuts.js.es6   | 41 +++++++++++--------
 .../discourse/routes/application.js.es6       |  4 +-
 .../modal/keyboard-shortcuts-help.hbs         |  1 +
 config/locales/client.en.yml                  |  1 +
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 26f716c1f..be0f13800 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -53,7 +53,8 @@ const PATH_BINDINGS = {
       'q': 'quoteReply',
       'b': 'toggleBookmark',
       'f': 'toggleBookmarkTopic',
-      'shift+r': 'replyToTopic'
+      'shift+r': 'replyToTopic',
+      'shift+z shift+z': 'logout'
     };
 
 
@@ -73,25 +74,29 @@ export default {
     _.each(FUNCTION_BINDINGS, this._bindToFunction, this);
   },
 
-  toggleBookmark(){
+  toggleBookmark() {
     this.sendToSelectedPost('toggleBookmark');
     this.sendToTopicListItemView('toggleBookmark');
   },
 
-  toggleBookmarkTopic(){
+  toggleBookmarkTopic() {
     const topic = this.currentTopic();
     // BIG hack, need a cleaner way
-    if(topic && $('.posts-wrapper').length > 0) {
+    if (topic && $('.posts-wrapper').length > 0) {
       topic.toggleBookmark();
     } else {
       this.sendToTopicListItemView('toggleBookmark');
     }
   },
 
-  quoteReply(){
+  logout() {
+    this.container.lookup('route:application').send('logout');
+  },
+
+  quoteReply() {
     $('.topic-post.selected button.create').click();
     // lazy but should work for now
-    setTimeout(function(){
+    setTimeout(function() {
       $('#wmd-quote-post').click();
     }, 500);
   },
@@ -185,25 +190,25 @@ export default {
     this.container.lookup('controller:application').send('showKeyboardShortcutsHelp');
   },
 
-  sendToTopicListItemView(action){
+  sendToTopicListItemView(action) {
     const elem = $('tr.selected.topic-list-item.ember-view')[0];
-    if(elem){
+    if (elem) {
       const view = Ember.View.views[elem.id];
       view.send(action);
     }
   },
 
-  currentTopic(){
+  currentTopic() {
     const topicController = this.container.lookup('controller:topic');
-    if(topicController) {
+    if (topicController) {
       const topic = topicController.get('model');
-      if(topic){
+      if (topic) {
         return topic;
       }
     }
   },
 
-  sendToSelectedPost(action){
+  sendToSelectedPost(action) {
     const container = this.container;
     // TODO: We should keep track of the post without a CSS class
     const selectedPostId = parseInt($('.topic-post.selected article.boxed').data('post-id'), 10);
@@ -266,7 +271,7 @@ export default {
     const $selected = $articles.filter('.selected');
     let index = $articles.index($selected);
 
-    if($selected.length !== 0){ //boundries check
+    if ($selected.length !== 0) { //boundries check
       // loop is not allowed
       if (direction === -1 && index === 0) { return; }
       if (direction === 1 && index === ($articles.size()-1) ) { return; }
@@ -277,15 +282,15 @@ export default {
       const scrollTop = $(document).scrollTop();
 
       index = 0;
-      $articles.each(function(){
+      $articles.each(function() {
         const top = $(this).position().top;
-        if(top > scrollTop) {
+        if (top > scrollTop) {
           return false;
         }
         index += 1;
       });
 
-      if(index >= $articles.length){
+      if (index >= $articles.length) {
         index = $articles.length - 1;
       }
 
@@ -299,7 +304,7 @@ export default {
       $articles.removeClass('selected');
       $article.addClass('selected');
 
-      if($article.is('.topic-list-item')){
+      if ($article.is('.topic-list-item')) {
         this.sendToTopicListItemView('select');
       }
 
@@ -355,7 +360,7 @@ export default {
         active = $('#navigation-bar li.active'),
         index = $sections.index(active) + direction;
 
-    if(index >= 0 && index < $sections.length){
+    if (index >= 0 && index < $sections.length) {
       $sections.eq(index).find('a').click();
     }
   },
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 3a05163f6..5944ccbd2 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -19,7 +19,9 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
   actions: {
 
     logout() {
-      this.currentUser.destroySession().then(() => logout(this.siteSettings, this.keyValueStore));
+      if (this.currentUser) {
+        this.currentUser.destroySession().then(() => logout(this.siteSettings, this.keyValueStore));
+      }
     },
 
     _collectTitleTokens(tokens) {
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 5877ef4c9..7581daf46 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -32,6 +32,7 @@
         <li>{{{i18n 'keyboard_shortcuts_help.application.help'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.application.dismiss_new_posts'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.application.dismiss_topics'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.log_out'}}}</li>
       </ul>
     </div>
     <div class="span6">
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 0397e286d..a8958b903 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2581,6 +2581,7 @@ en:
         help: '<b>?</b> Open keyboard help'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'
         dismiss_topics: '<b>x</b>, <b>t</b> Dismiss Topics'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Log Out'
       actions:
         title: 'Actions'
         bookmark_topic: '<b>f</b> Toggle bookmark topic'