-
Notifications
You must be signed in to change notification settings - Fork 56
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
configurable scroll element #67
Merged
briangonzalez
merged 2 commits into
DockYard:master
from
sebastianhelbig:configurable-scroll-element
Aug 9, 2017
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 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 |
---|---|---|
|
@@ -28,13 +28,24 @@ export default Mixin.create({ | |
}, | ||
|
||
updateScrollPosition(transitions) { | ||
const scrollElement = get(this, 'service.scrollElement'); | ||
let scrollPosition = get(this, 'service.position'); | ||
|
||
let preserveScrollPosition = transitions[transitions.length - 1] | ||
.handler.controller.get('preserveScrollPosition'); | ||
|
||
if (!preserveScrollPosition) { | ||
window.scrollTo(scrollPosition.x, scrollPosition.y); | ||
if ('window' === scrollElement) { | ||
window.scrollTo(scrollPosition.x, scrollPosition.y); | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove line. |
||
} else if ('#' === scrollElement.charAt(0)) { | ||
let element = document.getElementById(scrollElement.substring(1)); | ||
|
||
if (element) { | ||
element.scrollLeft = scrollPosition.x; | ||
element.scrollTop = scrollPosition.y; | ||
} | ||
} | ||
} | ||
} | ||
}); |
This file contains 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,20 +1,42 @@ | ||
/* eslint-disable */ | ||
import Ember from 'ember'; | ||
import Service from '@ember/service'; | ||
import { getWithDefault, computed, set, get } from '@ember/object'; | ||
|
||
const { getOwner, typeOf } = Ember; | ||
|
||
export default Service.extend({ | ||
scrollElement: 'window', | ||
|
||
init(...args) { | ||
this._super(...args); | ||
this._loadConfig(); | ||
set(this, 'scrollMap', {}); | ||
set(this, 'key', null); | ||
}, | ||
|
||
update() { | ||
const scrollElement = get(this, 'scrollElement'); | ||
const scrollMap = get(this, 'scrollMap'); | ||
const key = get(this, 'key'); | ||
let x; | ||
let y; | ||
|
||
if ('window' === scrollElement) { | ||
x = window.scrollX; | ||
y = window.scrollY; | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove line. |
||
} else if ('#' === scrollElement.charAt(0)) { | ||
let element = document.getElementById(scrollElement.substring(1)); | ||
|
||
if (element) { | ||
x = element.scrollLeft; | ||
y = element.scrollTop; | ||
} | ||
} | ||
|
||
if (key) { | ||
set(scrollMap, key, { x: window.scrollX, y: window.scrollY }); | ||
if (key && 'number' === typeOf(x) && 'number' === typeOf(y)) { | ||
set(scrollMap, key, { x, y }); | ||
} | ||
}, | ||
|
||
|
@@ -27,4 +49,16 @@ export default Service.extend({ | |
|
||
return getWithDefault(scrollMap, key, { x: 0, y: 0 }); | ||
}).volatile(), | ||
|
||
_loadConfig() { | ||
const config = getOwner(this).resolveRegistration('config:environment'); | ||
|
||
if (config && config.routerScroll && config.routerScroll.scrollElement) { | ||
const scrollElement = config.routerScroll.scrollElement; | ||
|
||
if ('string' === typeOf(config.routerScroll.scrollElement)) { | ||
set(this, 'scrollElement', config.routerScroll.scrollElement); | ||
} | ||
} | ||
} | ||
}); |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ktrhn can you put in an apostrophe in the word "application"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have in the last commit: 370bb90#diff-04c6e90faac2675aa89e2176d2eec7d8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Awesome, thanks!