Skip to content

Commit 5438eaf

Browse files
eneuhausereneuhauser
committed
Changing to have a separate line for each variable declaration
1 parent 4426d09 commit 5438eaf

File tree

3 files changed

+47
-41
lines changed

3 files changed

+47
-41
lines changed

‎dist/ember-json-api.js

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ define("json-api-adapter",
9393
* Suppress additional API calls if the relationship was already loaded via an `included` section
9494
*/
9595
findBelongsTo: function(store, snapshot, url, relationship) {
96-
var belongsTo = snapshot.belongsTo(relationship.key),
97-
belongsToLoaded = belongsTo && !belongsTo.record.get('currentState.isEmpty');
96+
var belongsTo = snapshot.belongsTo(relationship.key);
97+
var belongsToLoaded = belongsTo && !belongsTo.record.get('currentState.isEmpty');
9898

9999
if(belongsToLoaded) { return; }
100100

@@ -117,18 +117,18 @@ define("json-api-adapter",
117117
* and match the root key to the route
118118
*/
119119
updateRecord: function(store, type, snapshot) {
120-
var data = this._serializeData(store, type, snapshot),
121-
id = get(snapshot, 'id');
120+
var data = this._serializeData(store, type, snapshot);
121+
var id = get(snapshot, 'id');
122122

123123
return this.ajax(this.buildURL(type.typeKey, id, snapshot), 'PUT', {
124124
data: data
125125
});
126126
},
127127

128128
_serializeData: function(store, type, snapshot) {
129-
var serializer = store.serializerFor(type.typeKey),
130-
pluralType = Ember.String.pluralize(type.typeKey),
131-
json = {};
129+
var serializer = store.serializerFor(type.typeKey);
130+
var pluralType = Ember.String.pluralize(type.typeKey);
131+
var json = {};
132132

133133
json.data = serializer.serialize(snapshot, { includeId: true });
134134
if(!json.data.hasOwnProperty('type')) {
@@ -174,7 +174,7 @@ define("json-api-adapter",
174174

175175
pathForType: function(type) {
176176
var decamelized = Ember.String.decamelize(type);
177-
return Ember.String.pluralize(decamelized).replace(/_/g, '-');
177+
return Ember.String.pluralize(decamelized);
178178
}
179179
});
180180

@@ -282,13 +282,13 @@ define("json-api-adapter",
282282
* Extract top-level "data" containing a single primary data
283283
*/
284284
extractArrayData: function(data, payload) {
285-
var type = data.length > 0 ? data[0].type : null, serializer = this;
285+
var type = data.length > 0 ? data[0].type : null;
286286
data.forEach(function(item) {
287287
if(item.links) {
288-
serializer.extractRelationships(item.links, item);
288+
this.extractRelationships(item.links, item);
289289
//delete data.links;
290290
}
291-
});
291+
}.bind(this));
292292

293293
payload[type] = data;
294294
},
@@ -297,19 +297,20 @@ define("json-api-adapter",
297297
* Extract top-level "included" containing associated objects
298298
*/
299299
extractSideloaded: function(sideloaded) {
300-
var store = get(this, 'store'), models = {}, serializer = this;
300+
var store = get(this, 'store');
301+
var models = {};
301302

302303
sideloaded.forEach(function(link) {
303304
var type = link.type;
304305
if(link.links) {
305-
serializer.extractRelationships(link.links, link);
306+
this.extractRelationships(link.links, link);
306307
}
307308
delete link.type;
308309
if(!models[type]) {
309310
models[type] = [];
310311
}
311312
models[type].push(link);
312-
});
313+
}.bind(this));
313314

314315
this.pushPayload(store, models);
315316
},
@@ -318,7 +319,7 @@ define("json-api-adapter",
318319
* Parse the top-level "links" object.
319320
*/
320321
extractRelationships: function(links, resource) {
321-
var link, association, id, route, relationshipLink, cleanedRoute, linkKey;
322+
var link, association, id, route, relationshipLink, cleanedRoute;
322323

323324
// Clear the old format
324325
resource.links = {};
@@ -368,8 +369,8 @@ define("json-api-adapter",
368369
// SERIALIZATION
369370

370371
serializeIntoHash: function(hash, type, snapshot, options) {
371-
var pluralType = Ember.String.pluralize(type.typeKey),
372-
data = this.serialize(snapshot, options);
372+
var pluralType = Ember.String.pluralize(type.typeKey);
373+
var data = this.serialize(snapshot, options);
373374
if(!data.hasOwnProperty('type')) {
374375
data.type = pluralType;
375376
}
@@ -395,9 +396,9 @@ define("json-api-adapter",
395396
* Use "links" key
396397
*/
397398
serializeHasMany: function(record, json, relationship) {
398-
var attr = relationship.key,
399-
type = this.keyForRelationship(relationship.type.typeKey),
400-
key = this.keyForRelationship(attr);
399+
var attr = relationship.key;
400+
var type = this.keyForRelationship(relationship.type.typeKey);
401+
var key = this.keyForRelationship(attr);
401402

402403
if (relationship.kind === 'hasMany') {
403404
json.links = json.links || {};
@@ -418,9 +419,10 @@ define("json-api-adapter",
418419
}
419420

420421
function hasManyLink(key, type, record, attr) {
421-
var links = record.hasMany(attr).mapBy('id') || [],
422-
typeName = Ember.String.pluralize(type),
423-
linkages = [], index, total;
422+
var links = record.hasMany(attr).mapBy('id') || [];
423+
var typeName = Ember.String.pluralize(type);
424+
var linkages = [];
425+
var index, total;
424426

425427
for(index=0, total=links.length; index<total; ++index) {
426428
linkages.push({
@@ -445,7 +447,8 @@ define("json-api-adapter",
445447
}
446448
function getLinkageIds(linkage) {
447449
if(Ember.isEmpty(linkage)) { return null; }
448-
var ids = [], index, total;
450+
var ids = [];
451+
var index, total;
449452
for(index=0, total=linkage.length; index<total; ++index) {
450453
ids.push(normalizeLinkage(linkage[index]));
451454
}

‎dist/ember-json-api.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/json-api-serializer.js

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ DS.JsonApiSerializer = DS.RESTSerializer.extend({
8484
* Extract top-level "data" containing a single primary data
8585
*/
8686
extractArrayData: function(data, payload) {
87-
var type = data.length > 0 ? data[0].type : null, serializer = this;
87+
var type = data.length > 0 ? data[0].type : null;
8888
data.forEach(function(item) {
8989
if(item.links) {
90-
serializer.extractRelationships(item.links, item);
90+
this.extractRelationships(item.links, item);
9191
//delete data.links;
9292
}
93-
});
93+
}.bind(this));
9494

9595
payload[type] = data;
9696
},
@@ -99,19 +99,20 @@ DS.JsonApiSerializer = DS.RESTSerializer.extend({
9999
* Extract top-level "included" containing associated objects
100100
*/
101101
extractSideloaded: function(sideloaded) {
102-
var store = get(this, 'store'), models = {}, serializer = this;
102+
var store = get(this, 'store');
103+
var models = {};
103104

104105
sideloaded.forEach(function(link) {
105106
var type = link.type;
106107
if(link.links) {
107-
serializer.extractRelationships(link.links, link);
108+
this.extractRelationships(link.links, link);
108109
}
109110
delete link.type;
110111
if(!models[type]) {
111112
models[type] = [];
112113
}
113114
models[type].push(link);
114-
});
115+
}.bind(this));
115116

116117
this.pushPayload(store, models);
117118
},
@@ -120,7 +121,7 @@ DS.JsonApiSerializer = DS.RESTSerializer.extend({
120121
* Parse the top-level "links" object.
121122
*/
122123
extractRelationships: function(links, resource) {
123-
var link, association, id, route, relationshipLink, cleanedRoute, linkKey;
124+
var link, association, id, route, relationshipLink, cleanedRoute;
124125

125126
// Clear the old format
126127
resource.links = {};
@@ -170,8 +171,8 @@ DS.JsonApiSerializer = DS.RESTSerializer.extend({
170171
// SERIALIZATION
171172

172173
serializeIntoHash: function(hash, type, snapshot, options) {
173-
var pluralType = Ember.String.pluralize(type.typeKey),
174-
data = this.serialize(snapshot, options);
174+
var pluralType = Ember.String.pluralize(type.typeKey);
175+
var data = this.serialize(snapshot, options);
175176
if(!data.hasOwnProperty('type')) {
176177
data.type = pluralType;
177178
}
@@ -197,9 +198,9 @@ DS.JsonApiSerializer = DS.RESTSerializer.extend({
197198
* Use "links" key
198199
*/
199200
serializeHasMany: function(record, json, relationship) {
200-
var attr = relationship.key,
201-
type = this.keyForRelationship(relationship.type.typeKey),
202-
key = this.keyForRelationship(attr);
201+
var attr = relationship.key;
202+
var type = this.keyForRelationship(relationship.type.typeKey);
203+
var key = this.keyForRelationship(attr);
203204

204205
if (relationship.kind === 'hasMany') {
205206
json.links = json.links || {};
@@ -220,9 +221,10 @@ function belongsToLink(key, type, id) {
220221
}
221222

222223
function hasManyLink(key, type, record, attr) {
223-
var links = record.hasMany(attr).mapBy('id') || [],
224-
typeName = Ember.String.pluralize(type),
225-
linkages = [], index, total;
224+
var links = record.hasMany(attr).mapBy('id') || [];
225+
var typeName = Ember.String.pluralize(type);
226+
var linkages = [];
227+
var index, total;
226228

227229
for(index=0, total=links.length; index<total; ++index) {
228230
linkages.push({
@@ -247,7 +249,8 @@ function getLinkageId(linkage) {
247249
}
248250
function getLinkageIds(linkage) {
249251
if(Ember.isEmpty(linkage)) { return null; }
250-
var ids = [], index, total;
252+
var ids = [];
253+
var index, total;
251254
for(index=0, total=linkage.length; index<total; ++index) {
252255
ids.push(normalizeLinkage(linkage[index]));
253256
}

0 commit comments

Comments
 (0)