mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-28 12:10:51 +02:00
Code Issues Releases Wiki Activity

Move extractMeta override to serializer

Browse Source
This commit is contained in:
Toby Zerner
2015-02-09 20:14:18 +10:30
parent 071e403020
commit eec50f687c
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ember/app/adapters/application.js
View File

@@ -5,15 +5,6 @@ import config from '../config/environment';
export default JsonApiAdapter.extend({ export default JsonApiAdapter.extend({
host: config.apiURL, host: config.apiURL,
// 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.metaForType(type, payload.meta);
delete payload.meta;
}
},
ajaxError: function(jqXHR) { ajaxError: function(jqXHR) {
var errors = this._super(jqXHR); var errors = this._super(jqXHR);
if (errors instanceof DS.InvalidError) { if (errors instanceof DS.InvalidError) {

23
ember/app/serializers/application.js
View File

@@ -1,13 +1,22 @@
import JsonApiSerializer from 'ember-json-api/json-api-serializer'; import JsonApiSerializer from 'ember-json-api/json-api-serializer';
export default JsonApiSerializer.extend({ export default JsonApiSerializer.extend({
normalize: function(type, hash, property) { normalize: function(type, hash, property) {
var json = {}; var json = {};
for (var prop in hash) { for (var prop in hash) {
json[prop.camelize()] = hash[prop]; json[prop.camelize()] = hash[prop];
} }
return this._super(type, json, property); 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;
}
}
}); });