Skip to content

Commit 689b2fa

Browse files
committed
Merge pull request warp-drive-data#2215 from emberjs/unused-vars-jshint
remove unused variables and enforce in jshint
2 parents dd0ccba + 9830874 commit 689b2fa

File tree

14 files changed

+16
-54
lines changed

14 files changed

+16
-54
lines changed

.jshintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,6 @@
6161
"strict": false,
6262
"white": false,
6363
"eqnull": true,
64-
"esnext": true
64+
"esnext": true,
65+
"unused": "vars"
6566
}

packages/activemodel-adapter/lib/system/active_model_adapter.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {RESTAdapter} from "ember-data/adapters";
22
import {InvalidError} from "ember-data/system/adapter";
33
import {pluralize} from "ember-inflector";
4-
import ActiveModelSerializer from "activemodel-adapter/system/active_model_serializer";
54

65
/**
76
@module ember-data

packages/ember-data/lib/main.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,15 @@ DS.RootState = RootState;
8080
DS.attr = attr;
8181
DS.Errors = Errors;
8282

83-
DS.AttributeChange = AttributeChange;
84-
DS.RelationshipChange = RelationshipChange;
85-
DS.RelationshipChangeAdd = RelationshipChangeAdd;
86-
DS.OneToManyChange = OneToManyChange;
87-
DS.ManyToNoneChange = OneToManyChange;
88-
DS.OneToOneChange = OneToOneChange;
89-
DS.ManyToManyChange = ManyToManyChange;
83+
DS.AttributeChange = AttributeChange;
84+
DS.RelationshipChange = RelationshipChange;
85+
DS.RelationshipChangeAdd = RelationshipChangeAdd;
86+
DS.RelationshipChangeRemove = RelationshipChangeRemove;
87+
DS.ManyToNoneChange = ManyToNoneChange;
88+
DS.OneToManyChange = OneToManyChange;
89+
DS.ManyToNoneChange = OneToManyChange;
90+
DS.OneToOneChange = OneToOneChange;
91+
DS.ManyToManyChange = ManyToManyChange;
9092

9193
DS.Adapter = Adapter;
9294
DS.InvalidError = InvalidError;

packages/ember-data/lib/serializers/embedded_records_mixin.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ var get = Ember.get;
22
var forEach = Ember.EnumerableUtils.forEach;
33
var camelize = Ember.String.camelize;
44

5-
import {pluralize} from "ember-inflector";
6-
75
/**
86
## Using Embedded Records
97
@@ -181,7 +179,6 @@ var EmbeddedRecordsMixin = Ember.Mixin.create({
181179
*/
182180
serializeBelongsTo: function(record, json, relationship) {
183181
var attr = relationship.key;
184-
var attrs = this.get('attrs');
185182
if (this.noSerializeOptionSpecified(attr)) {
186183
this._super(record, json, relationship);
187184
return;
@@ -291,7 +288,6 @@ var EmbeddedRecordsMixin = Ember.Mixin.create({
291288
*/
292289
serializeHasMany: function(record, json, relationship) {
293290
var attr = relationship.key;
294-
var attrs = this.get('attrs');
295291
if (this.noSerializeOptionSpecified(attr)) {
296292
this._super(record, json, relationship);
297293
return;
@@ -366,8 +362,6 @@ var EmbeddedRecordsMixin = Ember.Mixin.create({
366362
// checks config for attrs option to serialize records
367363
noSerializeOptionSpecified: function(attr) {
368364
var option = this.attrsOption(attr);
369-
var serializeRecords = this.hasSerializeRecordsOption(attr);
370-
var serializeIds = this.hasSerializeIdsOption(attr);
371365
return !(option && (option.serialize || option.embedded));
372366
},
373367

packages/ember-data/lib/serializers/json_serializer.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { RelationshipChange } from "ember-data/system/changes";
22
var get = Ember.get;
3-
var set = Ember.set;
43
var isNone = Ember.isNone;
54
var map = Ember.ArrayPolyfills.map;
65
var merge = Ember.merge;
@@ -196,7 +195,7 @@ export default Ember.Object.extend({
196195
@private
197196
*/
198197
normalizeAttributes: function(type, hash) {
199-
var payloadKey, key;
198+
var payloadKey;
200199

201200
if (this.keyForAttribute) {
202201
type.eachAttribute(function(key) {
@@ -215,7 +214,7 @@ export default Ember.Object.extend({
215214
@private
216215
*/
217216
normalizeRelationships: function(type, hash) {
218-
var payloadKey, key;
217+
var payloadKey;
219218

220219
if (this.keyForRelationship) {
221220
type.eachRelationship(function(key, relationship) {

packages/ember-data/lib/serializers/rest_serializer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import JSONSerializer from "ember-data/serializers/json_serializer";
66
var get = Ember.get;
7-
var set = Ember.set;
87
var forEach = Ember.ArrayPolyfills.forEach;
98
var map = Ember.ArrayPolyfills.map;
109
var camelize = Ember.String.camelize;

packages/ember-data/lib/system/adapter.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
*/
44

55
var get = Ember.get;
6-
var set = Ember.set;
7-
var map = Ember.ArrayPolyfills.map;
86

97
var errorProps = [
108
'description',

packages/ember-data/lib/system/container_proxy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ContainerProxy.prototype.registerDeprecation = function(deprecated, valid) {
3636
};
3737

3838
ContainerProxy.prototype.registerDeprecations = function(proxyPairs) {
39-
var i, proxyPair, deprecated, valid, proxy;
39+
var i, proxyPair, deprecated, valid;
4040

4141
for (i = proxyPairs.length; i > 0; i--) {
4242
proxyPair = proxyPairs[i - 1];

packages/ember-data/lib/system/model/states.js

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -173,18 +173,6 @@ var set = Ember.set;
173173
@class RootState
174174
*/
175175

176-
function hasDefinedProperties(object) {
177-
// Ignore internal property defined by simulated `Ember.create`.
178-
var names = Ember.keys(object);
179-
var i, l, name;
180-
for (i = 0, l = names.length; i < l; i++ ) {
181-
name = names[i];
182-
if (object.hasOwnProperty(name) && object[name]) { return true; }
183-
}
184-
185-
return false;
186-
}
187-
188176
function didSetProperty(record, context) {
189177
if (context.value === context.originalValue) {
190178
delete record._attributes[context.name];
@@ -259,12 +247,8 @@ var DirtyState = {
259247
loadingData: Ember.K,
260248

261249
propertyWasReset: function(record, name) {
262-
var stillDirty = false;
263-
264-
for (var prop in record._attributes) {
265-
stillDirty = true;
266-
break;
267-
}
250+
var length = Ember.keys(record._attributes);
251+
var stillDirty = length > 0;
268252

269253
if (!stillDirty) { record.send('rolledBack'); }
270254
},

packages/ember-data/lib/system/record_array_manager.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
ManyArray
1010
} from "ember-data/system/record_arrays";
1111
var get = Ember.get;
12-
var set = Ember.set;
1312
var forEach = Ember.EnumerableUtils.forEach;
1413

1514
/**

0 commit comments

Comments
 (0)