From 2d2bf4dd567d6f58087269b6d72cfa05ceead458 Mon Sep 17 00:00:00 2001 From: Robin Ward <robin.ward@gmail.com> Date: Fri, 6 May 2016 11:11:14 -0400 Subject: [PATCH] FIX: Keyboard controls were broken at the bottom of topics --- .../javascripts/discourse/components/topic-list-item.js.es6 | 5 +---- .../javascripts/discourse/lib/keyboard-shortcuts.js.es6 | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6 index 21d7b3afe..943a7b662 100644 --- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6 @@ -10,10 +10,7 @@ export default Ember.Component.extend(StringBuffer, { actions: { toggleBookmark() { - const self = this; - this.get('topic').toggleBookmark().finally(function() { - self.rerender(); - }); + this.get('topic').toggleBookmark().finally(() => this.rerender()); } }, diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 index ef505ebe8..f44bc3c40 100644 --- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 +++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 @@ -294,10 +294,6 @@ export default { $articles.removeClass('selected'); $article.addClass('selected'); - if ($article.is('.topic-list-item')) { - this.sendToTopicListItemView('select'); - } - if ($article.is('.topic-post')) { $('a.tabLoc', $article).focus(); }