diff --git a/addon/components/docs-viewer/component.js b/addon/components/docs-viewer/component.js index 1b3748dcd..192c54547 100644 --- a/addon/components/docs-viewer/component.js +++ b/addon/components/docs-viewer/component.js @@ -1,4 +1,3 @@ -import $ from 'jquery'; import { inject as service } from '@ember/service'; import Component from '@ember/component'; import layout from './template'; @@ -45,11 +44,11 @@ export default Component.extend(EKMixin, { }, didInsertElement() { - $('body').addClass('docs-viewer--showing'); + document.querySelector('body').classList.add('docs-viewer--showing'); }, willDestroyElement() { - $('body').removeClass('docs-viewer--showing'); + document.querySelector('body').classList.remove('docs-viewer--showing'); this.get('docsRoutes').resetState(); }, @@ -66,7 +65,7 @@ export default Component.extend(EKMixin, { }), searchIsNotFocused() { - return !this.$('.docs-viewer-search__input').is(':focus'); + return !this.element.querySelector('.docs-viewer-search__input') === document.activeElement; } }); diff --git a/addon/components/docs-viewer/x-search/component.js b/addon/components/docs-viewer/x-search/component.js index c43289bde..6253e44da 100644 --- a/addon/components/docs-viewer/x-search/component.js +++ b/addon/components/docs-viewer/x-search/component.js @@ -96,7 +96,7 @@ export default Component.extend(EKMixin, { }), focusSearch: on(keyUp('Slash'), keyUp('KeyS'), function() { - this.$('.docs-viewer-search__input').focus(); + this.element.querySelector('.docs-viewer-search__input').focus(); }), unfocusSearch: on(keyUp('Escape'), function() { @@ -104,7 +104,7 @@ export default Component.extend(EKMixin, { rawSearchResults: null, didSearch: false }); - this.$('.docs-viewer-search__input').blur(); + this.element.querySelector('.docs-viewer-search__input').blur(); }), clearSearch() { @@ -114,8 +114,9 @@ export default Component.extend(EKMixin, { rawSearchResults: null, query: null }); - this.$('.docs-viewer-search__input').val(''); - this.$('.docs-viewer-search__input').blur(); + let input = this.element.querySelector('.docs-viewer-search__input'); + input.value = ''; + input.blur(); }, actions: { diff --git a/addon/services/docs-search.js b/addon/services/docs-search.js index e106d5da0..8963faba7 100644 --- a/addon/services/docs-search.js +++ b/addon/services/docs-search.js @@ -1,8 +1,6 @@ import Service from '@ember/service'; import { getOwner } from '@ember/application'; import { computed } from '@ember/object'; -import { resolve } from 'rsvp'; -import $ from 'jquery'; import lunr from 'lunr'; const { Index, Query } = lunr; @@ -74,7 +72,8 @@ export default Service.extend({ loadSearchIndex() { if (!this._searchIndex) { - this._searchIndex = resolve($.get(this.get('_indexURL'))) + this._searchIndex = fetch(this.get('_indexURL')) + .then(res => res.json()) .then(json => { return { index: Index.load(json.index), diff --git a/config/ember-try.js b/config/ember-try.js index 4c5a61023..469d51d96 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -19,7 +19,8 @@ module.exports = function() { name: 'ember-lts-2.12', npm: { devDependencies: { - 'ember-source': '~2.12.0' + 'ember-source': '~2.12.0', + 'ember-native-dom-event-dispatcher': '~0.6.4' } } }, @@ -27,7 +28,8 @@ module.exports = function() { name: 'ember-lts-2.16', npm: { devDependencies: { - 'ember-source': '~2.16.0' + 'ember-source': '~2.16.0', + 'ember-native-dom-event-dispatcher': '~0.6.4' } } }, @@ -35,7 +37,8 @@ module.exports = function() { name: 'ember-lts-2.18', npm: { devDependencies: { - 'ember-source': '~2.18.0' + 'ember-source': '~2.18.0', + 'ember-native-dom-event-dispatcher': '~0.6.4' } } },