Skip to content

Removing jQuery usage from app #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/components/ember-anchor.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import $ from 'jquery';
import { get } from '@ember/object';
import AnchorComponent from 'ember-anchor/components/ember-anchor';
import config from 'ember-api-docs/config/environment';
import getOffset from 'ember-api-docs/utils/get-offset';

export default AnchorComponent.extend({

// This overrides Ember Anchor to support scrolling within a fixed position element
_scrollToElemPosition() {
let qp = this.anchorQueryParam;
let qpVal = this.get(get(this, 'attrs.a') ? 'a' : `controller.${qp}`);
let elem = $(`[data-${qp}="${qpVal}"]`);
let offset = elem.offset() ? elem.offset().top : 0;
if (offset) {
$(config.APP.scrollContainerSelector).scrollTop(offset);
let elem = document.querySelector(`[data-${qp}="${qpVal}"]`);

if (elem && elem.offsetHeight) {
const offsetToScroll = getOffset(elem, config.APP.scrollContainerSelector)
document.querySelector(config.APP.scrollContainerSelector).scrollTo(0, offsetToScroll);
}
}
});
11 changes: 6 additions & 5 deletions app/mixins/scroll-tracker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Mixin from '@ember/object/mixin';
import { inject as service } from '@ember/service';
import $ from 'jquery';
import config from 'ember-api-docs/config/environment';
import getOffset from 'ember-api-docs/utils/get-offset';

export default Mixin.create({

Expand All @@ -15,10 +15,11 @@ export default Mixin.create({
didTransition() {
this._super();
if ((typeof FastBoot === 'undefined') && window.location.search === '?anchor=' ) {
let elem = $('#methods');
let offset = elem.offset() ? elem.offset().top : 0;
if (offset) {
$(config.APP.scrollContainerSelector).scrollTop(offset - 10);
let elem = document.querySelector('#methods');

if (elem && elem.offsetHeight) {
const offsetToScroll = getOffset(elem, config.APP.scrollContainerSelector)
document.querySelector(config.APP.scrollContainerSelector).scrollTo(0, offsetToScroll - 10);
return;
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/services/scroll-position-reset.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Service from '@ember/service';
import $ from 'jquery';
import config from 'ember-api-docs/config/environment';

const { scrollContainerSelector } = config.APP;
Expand Down Expand Up @@ -27,7 +26,8 @@ export default Service.extend({

doReset() {
if (this._shouldResetScroll) {
$(scrollContainerSelector).scrollTop(0);
const selector = document.querySelector(scrollContainerSelector);
selector.scrollTo(0,0);
this.set('_shouldResetScroll', false);
}
}
Expand Down
9 changes: 9 additions & 0 deletions app/utils/get-offset.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
export default function getOffset(element, container) {
let offsetTop = element.offsetTop;
let parent = element.offsetParent;
while (parent != null && parent != container) {
offsetTop += parent.offsetTop;
parent = parent.offsetParent;
}
return offsetTop;
}