Skip to content

Commit 8b24730

Browse files
committed
Merge pull request #264 from nathanhammond/master
Adding ember-route-alias to handle index routes.
2 parents acbb17a + e720ebb commit 8b24730

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

app/app.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ import Ember from 'ember';
22
import Resolver from 'ember/resolver';
33
import loadInitializers from 'ember/load-initializers';
44
import config from './config/environment';
5+
import RouteAliasResolverMixin from 'cargo/mixins/route-alias-resolver';
56

67
let App;
78

9+
let CargoResolver = Resolver.extend(RouteAliasResolverMixin);
10+
811
Ember.MODEL_FACTORY_INJECTIONS = true;
912

1013
App = Ember.Application.extend({
1114
modulePrefix: config.modulePrefix,
1215
podModulePrefix: config.podModulePrefix,
13-
Resolver
16+
Resolver: CargoResolver
1417
});
1518

1619
loadInitializers(App, config.modulePrefix);

app/router.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Router.map(function() {
1616
this.route('download');
1717
this.route('versions');
1818
this.route('version', { path: '/:version_num' });
19+
this.alias('index', '/', 'version');
20+
1921
this.route('reverse_dependencies');
2022

2123
// Well-known routes

app/routes/crate/index.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

app/routes/crate/version.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default Ember.Route.extend({
77
const requestedVersion = params.version_num;
88

99
const crate = this.modelFor('crate');
10-
const controller = this.controllerFor('crate.version');
10+
const controller = this.controllerFor(this.routeName);
1111
const maxVersion = crate.get('max_version');
1212

1313
// Fall back to the crate's `max_version` property
@@ -49,7 +49,7 @@ export default Ember.Route.extend({
4949
afterModel(model) {
5050
this._super(...arguments);
5151

52-
const controller = this.controllerFor('crate.version');
52+
const controller = this.controllerFor(this.routeName);
5353
const context = controller.get('requestedVersion') ? model : this.modelFor('crate');
5454

5555
context.get('version_downloads').then(downloads => {

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"ember-moment": "4.1.0",
4444
"ember-page-title": "2.0.7",
4545
"ember-rl-dropdown": "0.7.0",
46+
"ember-route-alias": "^0.1.3",
4647
"ember-suave": "1.2.3",
4748
"emberx-select": "2.0.2"
4849
}

0 commit comments

Comments
 (0)