@@ -45,10 +45,23 @@ Ember.Route.reopen({
45
45
} ) ;
46
46
47
47
Router . map ( function ( ) {
48
+ // Workaround: https://github.com/emberjs/ember.js/issues/13921
49
+ // wildcard routes need to be at the top
50
+ this . route ( "dashboard" , function ( ) { } ) ;
51
+ this . route ( "bulletin/sunday" , { path : "/sunday" } , function ( ) { } ) ;
52
+ this . route ( "not-found" , { path : "*path" } ) ;
53
+ // END WORKAROUND 13921
54
+
48
55
this . route ( "group" , { path : ":group_slug" } , function ( ) {
49
56
this . route ( "index" , { path : "/" } , function ( ) { } ) ;
50
57
this . route ( "edit" , function ( ) { } ) ;
51
58
59
+ this . route ( "bulletins" , { resetNamespace : true , path : "bulletins" } , function ( ) {
60
+ this . route ( "new" , function ( ) {
61
+ this . route ( "announcements" ) ;
62
+ } ) ;
63
+ } ) ;
64
+
52
65
this . route ( "bulletin" , { resetNamespace : true , path : "bulletins/:bulletin_id" } , function ( ) {
53
66
this . route ( "edit" ) ;
54
67
} ) ;
@@ -65,15 +78,6 @@ Router.map(function() {
65
78
this . route ( 'posts' , { resetNamespace : true , path : 'posts' } , function ( ) {
66
79
this . route ( 'new' , function ( ) { } ) ;
67
80
} ) ;
68
-
69
- this . route ( "bulletins" , { resetNamespace : true , path : "bulletins" } , function ( ) {
70
- this . route ( "new" , function ( ) {
71
- this . route ( "announcements" ) ;
72
- } ) ;
73
- } ) ;
74
- } ) ;
75
-
76
- this . route ( "bulletin/sunday" , { path : "/sunday" } , function ( ) {
77
81
} ) ;
78
82
79
83
this . route ( "login" ) ;
@@ -82,8 +86,6 @@ Router.map(function() {
82
86
this . route ( 'groups' , function ( ) {
83
87
this . route ( 'new' ) ;
84
88
} ) ;
85
- this . route ( 'dashboard' , function ( ) { } ) ;
86
- this . route ( "not-found" , { path : "*path" } ) ;
87
89
88
90
this . route ( 'settings' , function ( ) {
89
91
this . route ( 'password' ) ;
0 commit comments