Skip to content

Commit 26f4e12

Browse files
committed
Remove usage of Ember.EnumerableUtils
Closes #323
1 parent 15fafa4 commit 26f4e12

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

addon/mixin.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var set = Ember.set;
88
var setValidityMixin = Ember.Mixin.create({
99
isValid: Ember.computed('[email protected]', function() {
1010
var compactValidators = get(this, 'validators').compact();
11-
var filteredValidators = Ember.EnumerableUtils.filter(compactValidators, function(validator) {
11+
var filteredValidators = compactValidators.filter(function(validator) {
1212
return !get(validator, 'isValid');
1313
});
1414

@@ -141,7 +141,7 @@ export default Ember.Mixin.create(setValidityMixin, {
141141
if (validatorName === 'inline') {
142142
pushValidator.call(this, createInlineClass(this.validations[property][validatorName].callback));
143143
} else if (this.validations[property].hasOwnProperty(validatorName)) {
144-
Ember.EnumerableUtils.forEach(lookupValidator.call(this, validatorName), pushValidator, this);
144+
lookupValidator.call(this, validatorName).forEach(pushValidator, this);
145145
}
146146
}
147147
},
@@ -156,7 +156,7 @@ export default Ember.Mixin.create(setValidityMixin, {
156156
var self = this;
157157
return this._validate().then(function(vals) {
158158
var errors = get(self, 'errors');
159-
if (Ember.EnumerableUtils.indexOf(vals, false) > -1) {
159+
if (vals.indexOf(false) > -1) {
160160
return Ember.RSVP.reject(errors);
161161
}
162162
return errors;

test-support/helpers/validate-properties.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import Ember from 'ember';
22
import { test } from 'ember-qunit';
33

4-
var forEach = Ember.EnumerableUtils.forEach;
54
var run = Ember.run;
65

76
function validateValues(object, propertyName, values, isTestForValid) {
87
var promise = null;
98
var validatedValues = [];
109

11-
forEach(values, function(value) {
10+
values.forEach(function(value) {
1211
function handleValidation(errors) {
1312
var hasErrors = object.get('errors.' + propertyName + '.firstObject');
1413
if ((hasErrors && !isTestForValid) || (!hasErrors && isTestForValid)) {

0 commit comments

Comments
 (0)