File tree Expand file tree Collapse file tree 17 files changed +69
-28
lines changed Expand file tree Collapse file tree 17 files changed +69
-28
lines changed Original file line number Diff line number Diff line change
1
+ import Ember from 'ember' ;
2
+
3
+ export default Ember . Component . extend ( {
4
+ flashMessages : Ember . inject . service ( ) ,
5
+ message : Ember . computed . readOnly ( 'flashMessages.message' ) ,
6
+
7
+ elementId : 'flash' ,
8
+ tagName : 'p' ,
9
+ classNameBindings : [ 'message:shown' ]
10
+ } ) ;
Original file line number Diff line number Diff line change @@ -2,9 +2,6 @@ import Ember from 'ember';
2
2
3
3
export default Ember . Controller . extend ( {
4
4
searchController : Ember . inject . controller ( 'search' ) ,
5
-
6
- flashError : null ,
7
- nextFlashError : null ,
8
5
search : Ember . computed . oneWay ( 'searchController.q' ) ,
9
6
10
7
init ( ) {
@@ -54,11 +51,6 @@ export default Ember.Controller.extend({
54
51
Ember . $ ( document ) . off ( 'keydown' ) ;
55
52
} ,
56
53
57
- stepFlash ( ) {
58
- this . set ( 'flashError' , this . get ( 'nextFlashError' ) ) ;
59
- this . set ( 'nextFlashError' , null ) ;
60
- } ,
61
-
62
54
actions : {
63
55
search ( ) {
64
56
this . transitionToRoute ( 'search' , {
Original file line number Diff line number Diff line change @@ -2,6 +2,8 @@ import Ember from 'ember';
2
2
import ajax from 'ic-ajax' ;
3
3
4
4
export default Ember . Controller . extend ( {
5
+ flashMessages : Ember . inject . service ( ) ,
6
+
5
7
isResetting : false ,
6
8
7
9
actions : {
@@ -21,7 +23,7 @@ export default Ember.Controller.extend({
21
23
} else {
22
24
msg = 'An unknown error occurred' ;
23
25
}
24
- this . controllerFor ( 'application ') . set ( 'nextFlashError' , msg ) ;
26
+ this . get ( 'flashMessages ') . queue ( msg ) ;
25
27
// TODO: this should be an action, the route state machine
26
28
// should recieve signals not external transitions
27
29
this . transitionToRoute ( 'index' ) ;
Original file line number Diff line number Diff line change 1
1
import Ember from 'ember' ;
2
2
3
3
export default Ember . Mixin . create ( {
4
+ flashMessages : Ember . inject . service ( ) ,
5
+
4
6
beforeModel ( transition ) {
5
7
let user = this . session . get ( 'currentUser' ) ;
6
8
if ( user !== null ) {
@@ -19,8 +21,7 @@ export default Ember.Mixin.create({
19
21
} ) ;
20
22
} else {
21
23
this . session . set ( 'savedTransition' , transition ) ;
22
- this . controllerFor ( 'application' )
23
- . set ( 'nextFlashError' , 'Please log in to proceed' ) ;
24
+ this . get ( 'flashMessages' ) . queue ( 'Please log in to proceed' ) ;
24
25
return this . transitionTo ( 'index' ) ;
25
26
}
26
27
} ,
Original file line number Diff line number Diff line change @@ -2,6 +2,8 @@ import Ember from 'ember';
2
2
import ajax from 'ic-ajax' ;
3
3
4
4
export default Ember . Route . extend ( {
5
+ flashMessages : Ember . inject . service ( ) ,
6
+
5
7
beforeModel ( ) {
6
8
if ( this . session . get ( 'isLoggedIn' ) &&
7
9
this . session . get ( 'currentUser' ) === null ) {
@@ -20,7 +22,7 @@ export default Ember.Route.extend({
20
22
21
23
actions : {
22
24
didTransition ( ) {
23
- this . controllerFor ( 'application ') . stepFlash ( ) ;
25
+ this . get ( 'flashMessages ') . step ( ) ;
24
26
} ,
25
27
} ,
26
28
} ) ;
Original file line number Diff line number Diff line change 1
1
import Ember from 'ember' ;
2
2
3
3
export default Ember . Route . extend ( {
4
+ flashMessages : Ember . inject . service ( ) ,
5
+
4
6
model ( params ) {
5
7
return this . store . find ( 'category' , params . category_id ) . catch ( e => {
6
8
if ( e . errors . any ( e => e . detail === 'Not Found' ) ) {
7
- this . controllerFor ( 'application ') . set ( 'flashError' , `Category '${ params . category_id } ' does not exist` ) ;
9
+ this . get ( 'flashMessages ') . show ( `Category '${ params . category_id } ' does not exist` ) ;
8
10
}
9
11
} ) ;
10
12
}
Original file line number Diff line number Diff line change 1
1
import Ember from 'ember' ;
2
2
3
3
export default Ember . Route . extend ( {
4
+ flashMessages : Ember . inject . service ( ) ,
5
+
4
6
model ( params ) {
5
7
return this . store . find ( 'crate' , params . crate_id ) . catch ( e => {
6
8
if ( e . errors . any ( e => e . detail === 'Not Found' ) ) {
7
- return this . controllerFor ( 'application' ) . set ( 'flashError' , `Crate '${ params . crate_id } ' does not exist` ) ;
9
+ this . get ( 'flashMessages' ) . show ( `Crate '${ params . crate_id } ' does not exist` ) ;
10
+ return ;
8
11
}
9
12
} ) ;
10
13
} ,
Original file line number Diff line number Diff line change 1
1
import Ember from 'ember' ;
2
2
3
3
export default Ember . Route . extend ( {
4
+ flashMessages : Ember . inject . service ( ) ,
5
+
4
6
redirect ( ) {
5
7
let crate = this . modelFor ( 'crate' ) ;
6
8
@@ -11,7 +13,7 @@ export default Ember.Route.extend({
11
13
// Redirect to the crate's main page and show a flash error if
12
14
// no documentation is found
13
15
let message = 'Crate does not supply a documentation URL' ;
14
- this . controllerFor ( 'application ') . set ( 'nextFlashError' , message ) ;
16
+ this . get ( 'flashMessages ') . queue ( message ) ;
15
17
this . replaceWith ( 'crate' , crate ) ;
16
18
}
17
19
} ,
Original file line number Diff line number Diff line change 1
1
import Ember from 'ember' ;
2
2
3
3
export default Ember . Route . extend ( {
4
+ flashMessages : Ember . inject . service ( ) ,
5
+
4
6
redirect ( ) {
5
7
let crate = this . modelFor ( 'crate' ) ;
6
8
@@ -11,7 +13,7 @@ export default Ember.Route.extend({
11
13
// Redirect to the crate's main page and show a flash error if
12
14
// no repository is found
13
15
let message = 'Crate does not supply a repository URL' ;
14
- this . controllerFor ( 'application ') . set ( 'nextFlashError' , message ) ;
16
+ this . get ( 'flashMessages ') . queue ( message ) ;
15
17
this . replaceWith ( 'crate' , crate ) ;
16
18
}
17
19
} ,
Original file line number Diff line number Diff line change @@ -2,6 +2,8 @@ import Ember from 'ember';
2
2
import ajax from 'ic-ajax' ;
3
3
4
4
export default Ember . Route . extend ( {
5
+ flashMessages : Ember . inject . service ( ) ,
6
+
5
7
refreshAfterLogin : Ember . observer ( 'session.isLoggedIn' , function ( ) {
6
8
this . refresh ( ) ;
7
9
} ) ,
@@ -89,7 +91,7 @@ export default Ember.Route.extend({
89
91
. then ( versions => {
90
92
const version = versions . find ( version => version . get ( 'num' ) === params . version_num ) ;
91
93
if ( params . version_num && ! version ) {
92
- this . controllerFor ( 'application ') . set ( 'nextFlashError' ,
94
+ this . get ( 'flashMessages ') . queue (
93
95
`Version '${ params . version_num } ' of crate '${ crate . get ( 'name' ) } ' does not exist` ) ;
94
96
}
95
97
You can’t perform that action at this time.
0 commit comments