mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-04 15:37:51 +02:00
Code Issues Releases Wiki Activity

Upgrade ember-cli to 0.1.4 and fix related breakage. closes #18

Browse Source
This commit is contained in:
Toby Zerner
2014-12-23 12:45:07 +10:30
parent 9365205ac4
commit 238bb40360
28 changed files with 225 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ember/app/router.js
View File

@@ -1,12 +1,13 @@
import Ember from 'ember';
import config from './config/environment';
console.log(config.locationType);
var Router = Ember.Router.extend({
location: FlarumENV.locationType
location: config.locationType
});
Router.map(function() {
this.resource('categories', { path: '/categories' });
this.resource('categories', { path: '/categories' });
this.resource('discussions', { path: '/' }, function() {
this.resource('discussion', { path: '/:id/:slug' });
@@ -18,7 +19,6 @@ Router.map(function() {
this.route('discussions');
this.route('preferences');
});
});
export default Router;