File tree Expand file tree Collapse file tree 4 files changed +36
-24
lines changed Expand file tree Collapse file tree 4 files changed +36
-24
lines changed Original file line number Diff line number Diff line change 1
1
import Route from '@ember/routing/route' ;
2
2
import { inject as service } from '@ember/service' ;
3
3
4
- import window from 'ember-window-mock ' ;
4
+ import * as localStorage from '../utils/local-storage ' ;
5
5
6
6
/**
7
7
* This route will open a popup window directed at the `github-login` route.
@@ -15,11 +15,7 @@ export default Route.extend({
15
15
session : service ( ) ,
16
16
17
17
beforeModel ( transition ) {
18
- try {
19
- window . localStorage . removeItem ( 'github_response' ) ;
20
- } catch ( e ) {
21
- // ignore error
22
- }
18
+ localStorage . removeItem ( 'github_response' ) ;
23
19
24
20
window . github_response = undefined ;
25
21
let windowDimensions = [
Original file line number Diff line number Diff line change @@ -2,14 +2,13 @@ import { action } from '@ember/object';
2
2
import Service , { inject as service } from '@ember/service' ;
3
3
import { tracked } from '@glimmer/tracking' ;
4
4
5
- import window from 'ember-window-mock' ;
6
-
7
5
import config from '../config/environment' ;
6
+ import * as localStorage from '../utils/local-storage' ;
8
7
9
8
export default class DesignService extends Service {
10
9
@service fastboot ;
11
10
12
- @tracked useNewDesign = ! this . fastboot . isFastBoot && window . localStorage . getItem ( 'use-new-design' ) === 'true' ;
11
+ @tracked useNewDesign = ! this . fastboot . isFastBoot && localStorage . getItem ( 'use-new-design' ) === 'true' ;
13
12
@tracked showToggleButton = config . environment === 'development' ;
14
13
15
14
constructor ( ) {
@@ -20,6 +19,6 @@ export default class DesignService extends Service {
20
19
@action
21
20
toggle ( ) {
22
21
this . useNewDesign = ! this . useNewDesign ;
23
- window . localStorage . setItem ( 'use-new-design' , String ( this . useNewDesign ) ) ;
22
+ localStorage . setItem ( 'use-new-design' , String ( this . useNewDesign ) ) ;
24
23
}
25
24
}
Original file line number Diff line number Diff line change @@ -2,9 +2,9 @@ import { alias } from '@ember/object/computed';
2
2
import Service , { inject as service } from '@ember/service' ;
3
3
4
4
import { task } from 'ember-concurrency' ;
5
- import window from 'ember-window-mock' ;
6
5
7
6
import ajax from '../utils/ajax' ;
7
+ import * as localStorage from '../utils/local-storage' ;
8
8
9
9
export default class SessionService extends Service {
10
10
@service store ;
@@ -16,22 +16,14 @@ export default class SessionService extends Service {
16
16
@alias ( 'loadUserTask.last.value.ownedCrates' ) ownedCrates ;
17
17
18
18
get isLoggedIn ( ) {
19
- try {
20
- return window . localStorage . getItem ( 'isLoggedIn' ) === '1' ;
21
- } catch ( e ) {
22
- return false ;
23
- }
19
+ return localStorage . getItem ( 'isLoggedIn' ) === '1' ;
24
20
}
25
21
26
22
set isLoggedIn ( value ) {
27
- try {
28
- if ( value ) {
29
- window . localStorage . setItem ( 'isLoggedIn' , '1' ) ;
30
- } else {
31
- window . localStorage . removeItem ( 'isLoggedIn' ) ;
32
- }
33
- } catch ( e ) {
34
- // ignore error
23
+ if ( value ) {
24
+ localStorage . setItem ( 'isLoggedIn' , '1' ) ;
25
+ } else {
26
+ localStorage . removeItem ( 'isLoggedIn' ) ;
35
27
}
36
28
}
37
29
Original file line number Diff line number Diff line change
1
+ import window from 'ember-window-mock' ;
2
+
3
+ export function getItem ( key ) {
4
+ try {
5
+ return window . localStorage . getItem ( key ) ;
6
+ } catch ( e ) {
7
+ return null ;
8
+ }
9
+ }
10
+
11
+ export function setItem ( key , value ) {
12
+ try {
13
+ window . localStorage . setItem ( key , value ) ;
14
+ } catch ( e ) {
15
+ // ignored
16
+ }
17
+ }
18
+
19
+ export function removeItem ( key ) {
20
+ try {
21
+ window . localStorage . removeItem ( key ) ;
22
+ } catch ( e ) {
23
+ // ignored
24
+ }
25
+ }
You can’t perform that action at this time.
0 commit comments