-
-
Notifications
You must be signed in to change notification settings - Fork 113
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
sivakumar-kailasam
merged 4 commits into
ember-learn:master
from
dbendaou:removing_jquery_usage_from_app
Jun 4, 2019
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
8ef4b6f
🔥 removing jQuery usage from scroll-position-reset service
dbendaou 0b3ada7
🔥 get ride of jQuery usage in ember-anchor component
dbendaou f896446
♻️ refact to extract offset logic in utils
dbendaou 13ef7f2
👌 wrap block to check if elem exist before checking for elem.offsetHe…
dbendaou File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,19 @@ | ||
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}"]`); | ||
const offsetTop = elem.offsetHeight; | ||
|
||
if (offsetTop) { | ||
const offsetToScroll = getOffset(elem, config.APP.scrollContainerSelector) | ||
document.querySelector(config.APP.scrollContainerSelector).scrollTo(0, offsetToScroll); | ||
} | ||
} | ||
}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.