From ebf2da42f29742c35e2331843f45fc276290f6e6 Mon Sep 17 00:00:00 2001
From: howie <db@redshelf.com>
Date: Wed, 21 Nov 2018 11:27:12 -0600
Subject: [PATCH] Updates ember-keyboard configurations to be more flexible

---
 .../docs-header/search-box/component.js       |  3 +-
 .../docs-header/search-results/component.js   |  4 +-
 .../docs-keyboard-shortcuts/component.js      |  4 +-
 addon/components/docs-viewer/component.js     |  6 +--
 addon/controllers/application.js              | 54 -------------------
 5 files changed, 6 insertions(+), 65 deletions(-)
 delete mode 100644 addon/controllers/application.js

diff --git a/addon/components/docs-header/search-box/component.js b/addon/components/docs-header/search-box/component.js
index 562298ad6..50cacf1f3 100644
--- a/addon/components/docs-header/search-box/component.js
+++ b/addon/components/docs-header/search-box/component.js
@@ -16,10 +16,11 @@ export default Component.extend(EKMixin, {
 
   query: null,
 
+  keyboardActivated: true,
+  
   didInsertElement() {
     this._super();
 
-    this.set('keyboardActivated', true);
     this.get('fetchProject').perform();
   },
 
diff --git a/addon/components/docs-header/search-results/component.js b/addon/components/docs-header/search-results/component.js
index feb86f69e..ef9110d0b 100644
--- a/addon/components/docs-header/search-results/component.js
+++ b/addon/components/docs-header/search-results/component.js
@@ -19,11 +19,11 @@ export default Component.extend(EKMixin, {
   query: null, // passed in
   selectedIndex: null,
 
+  keyboardActivated: true,
+  
   didInsertElement() {
     this._super();
 
-    this.set('keyboardActivated', true);
-
     // Start downloading the search index immediately
     this.get('docsSearch').loadSearchIndex();
   },
diff --git a/addon/components/docs-keyboard-shortcuts/component.js b/addon/components/docs-keyboard-shortcuts/component.js
index 1391ee125..6288c6eaf 100644
--- a/addon/components/docs-keyboard-shortcuts/component.js
+++ b/addon/components/docs-keyboard-shortcuts/component.js
@@ -20,9 +20,7 @@ export default Component.extend(EKMixin, {
 
   isShowingKeyboardShortcuts: false,
 
-  activateKeyboard: on('init', function() {
-    this.set('keyboardActivated', true);
-  }),
+  keyboardActivated: true,
 
   goto: on(keyUp('KeyG'), function() {
     if (!formElementHasFocus()) {
diff --git a/addon/components/docs-viewer/component.js b/addon/components/docs-viewer/component.js
index a32d2306c..266172669 100644
--- a/addon/components/docs-viewer/component.js
+++ b/addon/components/docs-viewer/component.js
@@ -39,11 +39,7 @@ export default Component.extend(EKMixin, {
 
   classNames: 'docs-viewer docs-flex docs-flex-1',
 
-  init() {
-    this._super();
-
-    this.set('keyboardActivated', true);
-  },
+  keyboardActivated: true,
 
   willDestroyElement() {
     this._super(...arguments);
diff --git a/addon/controllers/application.js b/addon/controllers/application.js
deleted file mode 100644
index ed256f3c0..000000000
--- a/addon/controllers/application.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import Controller from '@ember/controller';
-import { EKMixin, keyUp } from 'ember-keyboard';
-import { inject as service } from '@ember/service';
-import { on } from '@ember/object/evented';
-import { later } from '@ember/runloop';
-import { formElementHasFocus } from '../keyboard-config';
-
-export default Controller.extend(EKMixin, {
-
-  router: service(),
-
-  isShowingKeyboardShortcuts: false,
-
-  activateKeyboard: on('init', function() {
-    this.set('keyboardActivated', true);
-  }),
-
-  goto: on(keyUp('KeyG'), function() {
-    if (!formElementHasFocus()) {
-      this.set('isGoingTo', true);
-      later(() => {
-        this.set('isGoingTo', false);
-      }, 500);
-    }
-  }),
-
-  gotoDocs: on(keyUp('KeyD'), function() {
-    if (!formElementHasFocus()) {
-      if (this.get('isGoingTo')) {
-        this.get('router').transitionTo('docs');
-      }
-    }
-  }),
-
-  gotoHome: on(keyUp('KeyH'), function() {
-    if (!formElementHasFocus()) {
-      if (this.get('isGoingTo')) {
-        this.get('router').transitionTo('index');
-      }
-    }
-  }),
-
-  toggleKeyboardShortcuts: on(keyUp('shift+Slash'), function() {
-    if (!formElementHasFocus()) {
-      this.toggleProperty('isShowingKeyboardShortcuts');
-    }
-  }),
-
-  actions: {
-    toggleKeyboardShortcuts() {
-      this.toggleProperty('isShowingKeyboardShortcuts');
-    }
-  }
-});