Skip to content

Update scroll container selector #322

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.

Sign up for GitHub

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 1 commit into from
Aug 17, 2017
Merged

Update scroll container selector #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/components/ember-anchor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default AnchorComponent.extend({
let offset = (elem && elem.offset && elem.offset()) ? elem.offset().top : null;
if (offset) {
const navMenuHeight = $('header').outerHeight();
$(config.APP.scrollContainerElement).scrollTop(offset - navMenuHeight - 10);
$(config.APP.scrollContainerSelector).scrollTop(offset - navMenuHeight - 10);
}
}
});
4 changes: 2 additions & 2 deletions app/services/scroll-position-reset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Service from '@ember/service';
import $ from 'jquery';
import config from 'ember-api-docs/config/environment';

const { scrollContainerElement } = config.APP;
const { scrollContainerSelector } = config.APP;


export default Service.extend({
Expand All @@ -27,7 +27,7 @@ export default Service.extend({

doReset() {
if (this.get('_shouldResetScroll')) {
$(scrollContainerElement).scrollTop(0);
$(scrollContainerSelector).scrollTop(0);
this.set('_shouldResetScroll', false);
}
}
Expand Down
4 changes: 2 additions & 2 deletions config/environment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = function(environment) {
APP: {
// Here you can pass flags/options to your application instance
// when it is created
scrollContainerElement: 'body'
scrollContainerSelector: 'body, html'
},

fastboot: {
Expand Down Expand Up @@ -58,7 +58,7 @@ module.exports = function(environment) {
ENV.APP.LOG_VIEW_LOOKUPS = false;

ENV.APP.rootElement = '#ember-testing';
ENV.APP.scrollContainerElement = '#ember-testing-container';
ENV.APP.scrollContainerSelector = '#ember-testing-container';

ENV.percy = {
breakpointsConfig: {
Expand Down
44 changes: 22 additions & 22 deletions tests/acceptance/scroll-reset-on-transition-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,63 +4,63 @@ import moduleForAcceptance from 'ember-api-docs/tests/helpers/module-for-accepta
import { visit } from 'ember-native-dom-helpers';
import config from 'ember-api-docs/config/environment';

const { scrollContainerElement } = config.APP;
const { scrollContainerSelector } = config.APP;

moduleForAcceptance('Acceptance | scroll reset on transition');

test('reset scroll on transitions', async function(assert) {
await visit('/');

$(scrollContainerElement).scrollTop(1000);
assert.notEqual($(scrollContainerElement).scrollTop(), 0, 'scroll position is NOT zero after scroll on fresh visit');
$(scrollContainerSelector).scrollTop(1000);
assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT zero after scroll on fresh visit');

await visit('/ember/1.0/classes/Ember.View');

assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is zero after transition to different route');
$(scrollContainerElement).scrollTop(1000);
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is zero after transition to different route');
$(scrollContainerSelector).scrollTop(1000);

await visit('/ember/1.0/classes/Ember.Component');

assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project.version.class.index to project-version.class.index (same route different model)');
$(scrollContainerElement).scrollTop(1000);
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project.version.class.index to project-version.class.index (same route different model)');
$(scrollContainerSelector).scrollTop(1000);

await visit('ember/1.0/modules/ember');

assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.class.index to project-version.module.index');
$(scrollContainerElement).scrollTop(1000);
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.class.index to project-version.module.index');
$(scrollContainerSelector).scrollTop(1000);

await visit('ember/1.0/modules/runtime');

assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.module.index (same route different model)');
$(scrollContainerElement).scrollTop(1000);
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.module.index (same route different model)');
$(scrollContainerSelector).scrollTop(1000);

await visit('ember/1.0/namespaces/Ember');

assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.namespace.index');
$(scrollContainerElement).scrollTop(1000);
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.namespace.index');
$(scrollContainerSelector).scrollTop(1000);

await visit('ember/1.0/namespaces/Ember.run');

assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.namespace.index (same route different model)');
$(scrollContainerElement).scrollTop(1000);
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.namespace.index (same route different model)');
$(scrollContainerSelector).scrollTop(1000);

await visit('ember/1.0/classes/Ember.RenderBuffer/');

assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.class.index');
$(scrollContainerElement).scrollTop(1000);
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.class.index');
$(scrollContainerSelector).scrollTop(1000);

await visit('ember/1.0/classes/Ember.RenderBuffer/properties');


assert.notEqual($(scrollContainerElement).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (properties)');
$(scrollContainerElement).scrollTop(1000);
assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (properties)');
$(scrollContainerSelector).scrollTop(1000);

await visit('ember/1.0/classes/Ember.RenderBuffer/methods');

assert.notEqual($(scrollContainerElement).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (methods)');
$(scrollContainerElement).scrollTop(1000);
assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (methods)');
$(scrollContainerSelector).scrollTop(1000);

await visit('ember/1.0/classes/Ember.Route/methods');

assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after visiting route with same tab but different model');
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after visiting route with same tab but different model');
});