github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-02 15:03:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade dependencies, fix ember-data problems

Browse Source
This commit is contained in:
Toby Zerner 2015-03-28 18:20:38 +10:30
parent 5a98faf78c
commit b92364a0f6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/core/ember/app/initializers/preload-data.js
View File

@ -2,7 +2,7 @@ import Ember from 'ember';
export default {
name: 'preload-data',
after: 'store',
after: 'ember-data',
initialize: function(container) {
var store = container.lookup('store:main');
if (!Ember.isEmpty(FLARUM_DATA)) {
@ -11,9 +11,9 @@ export default {
if (!Ember.isEmpty(FLARUM_SESSION)) {
FLARUM_SESSION.user = store.getById('user', FLARUM_SESSION.userId);
container.lookup('simple-auth-session:main').setProperties({
isAuthenticated: true,
authenticator: 'authenticator:flarum',
content: FLARUM_SESSION
isAuthenticated: true,
authenticator: 'authenticator:flarum',
content: FLARUM_SESSION
});
}
}

1
framework/core/ember/app/serializers/application.js
View File

@ -1,4 +1,5 @@
import JsonApiSerializer from 'ember-json-api/json-api-serializer';
export default JsonApiSerializer.extend({
store: Ember.inject.service()
});

2
framework/core/ember/bower.json
View File

@ -3,7 +3,7 @@
"dependencies": {
"jquery": "2.1.3",
"ember": "1.11.0-beta.3",
"ember-data": "1.0.0-beta.15",
"ember-data": "1.0.0-beta.16.1",
"ember-resolver": "~0.1.11",
"loader.js": "ember-cli/loader.js#1.0.1",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",

3
framework/core/ember/package.json
View File

@ -30,8 +30,7 @@
"ember-cli-qunit": "^0.3.8",
"ember-cli-simple-auth": "^0.7.2",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.15",
"ember-dynamic-component": "0.0.4",
"ember-data": "1.0.0-beta.16.1",
"ember-export-application-global": "^1.0.2",
"ember-json-api": "eneuhauser/ember-json-api",
"broccoli-ember-inline-template-compiler": "tobscure/broccoli-ember-inline-template-compiler#f884d11",