github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-04-26 06:34:06 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Upgrade to latest ember, cli, etc.

Browse Source 
ember 1.11.0-beta.3 fixes a demo-blocking bug. ember-json-api 0.3.0
fixes a bug so we can remove custom serializer code.
This commit is contained in:
Toby Zerner 2015-02-26 09:39:21 +10:30
parent 7d3f1078ec
commit bde89cdc31
3 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,22 +1,4 @@
import JsonApiSerializer from 'ember-json-api/json-api-serializer';
export default JsonApiSerializer.extend({
normalize: function(type, hash, property) {
var json = {};
for (var prop in hash) {
json[prop.camelize()] = hash[prop];
}
return this._super(type, json, property);
},
// We can get rid of this after
// https://github.com/kurko/ember-json-api/pull/59 is merged.
extractMeta: function(store, type, payload) {
if (payload && payload.meta) {
store.setMetadataFor(type, payload.meta);
delete payload.meta;
}
}
});

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

@ -2,15 +2,15 @@
"name": "flarum",
"dependencies": {
"jquery": "2.1.3",
"ember": "1.11.0-beta.1",
"ember-data": "1.0.0-beta.14.1",
"ember": "1.11.0-beta.3",
"ember-data": "1.0.0-beta.15",
"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",
"ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.0",
"ember-cli-test-loader": "0.1.3",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
"ember-qunit": "0.1.8",
"ember-qunit-notifications": "0.0.5",
"ember-qunit": "0.2.8",
"ember-qunit-notifications": "0.0.7",
"qunit": "~1.17.1",
"bootstrap": "~3.3.2",
"font-awesome": "~4",
@ -19,5 +19,10 @@
"moment": "~2.8.4",
"ember-simple-auth": "0.7.2",
"jquery.hotkeys": "jeresig/jquery.hotkeys#0.2.0"
},
"resolutions": {
"ember-cli-test-loader": "0.1.3",
"ember-qunit": "0.2.8",
"ember-qunit-notifications": "0.0.7"
}
}

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

@ -19,22 +19,22 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.0",
"ember-cli": "0.1.12",
"ember-cli-6to5": "^3.0.0",
"ember-cli": "^0.2.0-beta.1",
"ember-cli-app-version": "0.3.1",
"ember-cli-babel": "^4.1.0",
"ember-cli-content-security-policy": "0.3.0",
"ember-cli-dependency-checker": "0.0.7",
"ember-cli-htmlbars": "^0.7.4",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-less": "^1.0.5",
"ember-cli-htmlbars": "0.6.0",
"ember-cli-qunit": "0.3.1",
"ember-cli-app-version": "0.3.1",
"ember-cli-uglify": "1.0.1",
"ember-cli-qunit": "^0.3.8",
"ember-cli-simple-auth": "^0.7.2",
"ember-data": "1.0.0-beta.14",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.15",
"ember-dynamic-component": "0.0.4",
"ember-export-application-global": "^1.0.0",
"ember-json-api": "^0.2.3",
"ember-export-application-global": "^1.0.2",
"ember-json-api": "^0.3.0",
"express": "^4.8.5",
"glob": "^4.0.5"
}