Skip to content

Commit

Permalink
use public api
Browse files Browse the repository at this point in the history
  • Loading branch information
Offir Golan committed Mar 8, 2016
1 parent 0d5f467 commit 2e0c8ab
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions addon/validations/factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ function createValidationsClass(inheritedValidations, validations = {}) {
// Setup validation inheritance
if(inheritedValidations) {
validationRules = merge(validationRules, inheritedValidations.get('_validationRules'));
validatableAttributes = emberArray(inheritedValidations.get('_validatableAttributes').concat(validatableAttributes)).uniq();
validatableAttributes = emberArray(inheritedValidations.get('validatableAttributes').concat(validatableAttributes)).uniq();
}

// Normalize nested keys into actual objects and merge them with parent object
Expand Down Expand Up @@ -248,7 +248,7 @@ function createValidationsClass(inheritedValidations, validations = {}) {

destroy() {
this._super(...arguments);
let validatableAttrs = get(this, '_validatableAttributes');
let validatableAttrs = get(this, 'validatableAttributes');
let debouncedValidations = get(this, `_debouncedValidations`);

// Cancel all debounced timers
Expand Down Expand Up @@ -560,7 +560,7 @@ function validate(options = {}, async = true) {
var blackList = makeArray(options.excludes);
var validationResult, value;

var validationResults = get(this, '_validatableAttributes').reduce((v, name) => {
var validationResults = get(this, 'validatableAttributes').reduce((v, name) => {
if (!isEmpty(blackList) && blackList.indexOf(name) !== -1) {
return v;
}
Expand Down

0 comments on commit 2e0c8ab

Please sign in to comment.