Skip to content

Commit e4c940d

Browse files
committed
Reset scroll on route changes
1 parent 7367614 commit e4c940d

File tree

17 files changed

+19
-17
lines changed

17 files changed

+19
-17
lines changed

app/router.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import Ember from "ember";
22
import config from "./config/environment";
3+
import RouterScroll from 'ember-router-scroll';
34

4-
const Router = Ember.Router.extend({
5+
const Router = Ember.Router.extend(RouterScroll, {
56
rootURL: config.rootURL,
67
location: config.locationType,
78
metrics: Ember.inject.service(),

config/environment.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ module.exports = function(environment) {
55
modulePrefix: 'mcac',
66
environment: environment,
77
rootURL: '/',
8-
locationType: 'auto',
8+
locationType: 'router-scroll',
9+
historySupportMiddleware: true,
910
EmberENV: {
1011
FEATURES: {
1112
// Here you can enable experimental features on an ember canary build

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@
5555
"ember-disable-proxy-controllers": "^1.0.1",
5656
"ember-export-application-global": "^1.0.4",
5757
"ember-hiding-menu": "0.0.3",
58-
"ember-in-viewport": "2.0.8",
5958
"ember-load-initializers": "^0.5.0",
6059
"ember-marked": "0.0.4",
6160
"ember-metrics": "0.6.0",
6261
"ember-moment": "6.0.0",
6362
"ember-notify": "^5.1.0",
6463
"ember-resize": "0.0.10",
6564
"ember-resolver": "^2.0.3",
65+
"ember-router-scroll": "0.0.6",
6666
"ember-simple-auth": "^1.1.0",
6767
"ember-sinon": "0.5.0",
6868
"ember-sortable": "1.6.3",

tests/unit/controllers/bulletin/edit-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Ember from "ember";
22
import { moduleFor, test } from "ember-qunit";
33

44
moduleFor("controller:bulletin/edit", "Unit | Controller | Edit Bulletin", {
5-
needs: ['service:metrics']
5+
needs: ['service:metrics', 'service:router-scroll']
66
});
77

88
test('Reordering announcements', function(assert) {

tests/unit/controllers/group/edit-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { moduleFor, test } from 'ember-qunit';
22

33
moduleFor('controller:group/edit', {
4-
needs: ['service:metrics']
4+
needs: ['service:metrics', 'service:router-scroll']
55
});
66

77
// Replace this with your real tests.

tests/unit/controllers/groups/new-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Ember from "ember";
22
import { moduleFor, test } from "ember-qunit";
33

44
moduleFor("controller:groups/new", {
5-
needs: ['service:metrics']
5+
needs: ['service:metrics', 'service:router-scroll']
66
});
77

88
test("saving banner url on didUploadBanner callback", function(assert) {

tests/unit/controllers/index-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { moduleFor, test } from 'ember-qunit';
22

33
moduleFor('controller:index', 'Unit | Controller | index', {
4-
needs: ['service:metrics']
4+
needs: ['service:metrics', 'service:router-scroll']
55
});
66

77
// Replace this with your real tests.

tests/unit/controllers/login-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
} from 'ember-qunit';
55

66
moduleFor('controller:login', 'LoginController', {
7-
needs: ['service:metrics']
7+
needs: ['service:metrics', 'service:router-scroll']
88
});
99

1010
// Replace this with your real tests.

tests/unit/controllers/post/index-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { moduleFor, test } from "ember-qunit";
22
import Ember from "ember";
33

44
moduleFor("controller:post/index", {
5-
needs: ['service:metrics']
5+
needs: ['service:metrics', 'service:router-scroll']
66
});
77

88
test("displayPublishedAt: returns empty string when no date", function(assert) {

tests/unit/controllers/settings/password-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Ember from "ember";
22
import { moduleFor, test } from 'ember-qunit';
33

44
moduleFor('controller:settings/password', 'Unit | Controller | settings/password', {
5-
needs: ['service:metrics']
5+
needs: ['service:metrics', 'service:router-scroll']
66
});
77

88
test('it clears form after updating password', function(assert) {

0 commit comments

Comments
 (0)