File tree Expand file tree Collapse file tree 3 files changed +18
-19
lines changed Expand file tree Collapse file tree 3 files changed +18
-19
lines changed Original file line number Diff line number Diff line change 1
- import Router from '@ember/routing/router' ;
2
1
import { scheduleOnce } from '@ember/runloop' ;
3
2
import { inject as service } from '@ember/service' ;
4
3
import config from 'open-event-frontend/config/environment' ;
5
4
import RouterScroll from 'ember-router-scroll' ;
6
5
7
- const router = Router . extend ( RouterScroll , {
8
- location : config . locationType ,
9
- rootURL : config . rootURL ,
10
- metrics : service ( ) ,
11
- session : service ( ) ,
12
- headData : service ( ) ,
6
+ class Router extends RouterScroll {
7
+ location = config . locationType ;
8
+ rootURL = config . rootURL ;
9
+ @ service metrics ;
10
+ @ service session ;
11
+ @ service headData ;
13
12
14
13
setTitle ( title ) {
15
14
this . headData . set ( 'title' , title ) ;
16
- } ,
15
+ }
17
16
18
17
init ( ) {
19
- this . _super ( ...arguments ) ;
18
+ super . init ( ...arguments ) ;
20
19
this . on ( 'routeDidChange' , ( ) => {
21
20
this . _trackPage ( ) ;
22
21
} ) ;
23
- } ,
22
+ }
24
23
25
24
_trackPage ( ) {
26
25
scheduleOnce ( 'afterRender' , this , ( ) => {
@@ -30,9 +29,9 @@ const router = Router.extend(RouterScroll, {
30
29
this . set ( 'session.currentRouteName' , title ) ;
31
30
} ) ;
32
31
}
33
- } ) ;
32
+ }
34
33
35
- router . map ( function ( ) {
34
+ Router . map ( function ( ) {
36
35
this . route ( 'login' ) ;
37
36
this . route ( 'register' ) ;
38
37
this . route ( 'reset-password' ) ;
@@ -219,4 +218,4 @@ router.map(function() {
219
218
} ) ;
220
219
} ) ;
221
220
222
- export default router ;
221
+ export default Router ;
Original file line number Diff line number Diff line change 99
99
"ember-qunit" : " ^4.6.0" ,
100
100
"ember-resolver" : " ^7.0.0" ,
101
101
"ember-route-action-helper" : " ^2.0.8" ,
102
- "ember-router-scroll" : " DockYard/ember-router-scroll#695d894 " ,
102
+ "ember-router-scroll" : " ^2.0.0 " ,
103
103
"ember-scroll-to" : " ^0.6.5" ,
104
104
"ember-simple-auth" : " ^2.1.1" ,
105
105
"ember-simple-auth-token" : " ^4.0.7" ,
Original file line number Diff line number Diff line change @@ -7142,14 +7142,14 @@ ember-router-generator@^2.0.0:
7142
7142
"@babel/traverse" "^7.4.5"
7143
7143
recast "^0.18.1"
7144
7144
7145
- ember-router-scroll@DockYard/ember-router-scroll#695d894:
7146
- version "1.1.0"
7147
- resolved "https://codeload.github.com/DockYard/ember-router-scroll/tar.gz/695d89485927f6637a9c2631904b67bbc3f3087a"
7145
+ ember-router-scroll@^2.0.0:
7146
+ version "2.0.0"
7147
+ resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-2.0.0.tgz#389adc3c043fb22e7252900b874244006cca3fce"
7148
+ integrity sha512-dUQVk2XH+Ynt9kghpaLwvK9w+Ck1FM61bfWM94vVgoGe5TeN1sdC+d9DFRMgEXnski0WSG7WIDal5/P6SPlOHA==
7148
7149
dependencies:
7149
7150
ember-app-scheduler "^1.0.5"
7150
- ember-cli-babel "^7.1.2 "
7151
+ ember-cli-babel "^7.11.1 "
7151
7152
ember-compatibility-helpers "^1.1.2"
7152
- ember-getowner-polyfill "^2.2.0"
7153
7153
7154
7154
7155
7155
version "2.0.0"
You can’t perform that action at this time.
0 commit comments