Skip to content

Commit 1f20efd

Browse files
committed
Merge remote-tracking branch 'upstream/pr/534'
2 parents aa54a73 + bf2bc91 commit 1f20efd

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

app/router.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import Ember from 'ember';
22
import config from './config/environment';
33
import googlePageview from './mixins/google-pageview';
4+
import RouterScroll from 'ember-router-scroll';
45

5-
const Router = Ember.Router.extend(googlePageview, {
6+
const Router = Ember.Router.extend(googlePageview, RouterScroll, {
67
location: config.locationType
78
});
89

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: 'cargo',
66
environment: environment,
77
baseURL: '/',
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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"ember-resolver": "^2.0.3",
5151
"ember-rl-dropdown": "0.7.1",
5252
"ember-route-alias": "^0.1.3",
53+
"ember-router-scroll": "0.1.0",
5354
"ember-suave": "4.0.0",
5455
"ember-welcome-page": "^1.0.1",
5556
"emberx-select": "2.2.2",

0 commit comments

Comments
 (0)