Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added formData and fieldName to validation rule functions #178

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added formData and fieldName to validation rule functions #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions dist/form-for.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2343,6 +2343,22 @@ var formFor;
;
})(formFor || (formFor = {}));
;
var formFor;
(function (formFor) {
/**
* Wrapper object for a form-field attribute that exposes field-state to field directives.
*
* <p>Note that this interface exists for type-checking only; nothing actually implements this interface.
*/
var BindableFieldWrapper = (function () {
function BindableFieldWrapper() {
}
return BindableFieldWrapper;
})();
formFor.BindableFieldWrapper = BindableFieldWrapper;
;
})(formFor || (formFor = {}));
;
/// <reference path="../../definitions/angular.d.ts" />
/// <reference path="form-for-configuration.ts" />
/// <reference path="../utils/nested-object-helper.ts" />
Expand Down Expand Up @@ -2455,11 +2471,11 @@ var formFor;
if (value === undefined || value === null) {
value = ""; // Escape falsy values liked null or undefined, but not ones like 0
}
return this.validateFieldRequired_(value, validationRules) ||
this.validateFieldMinimum_(value, validationRules) ||
this.validateFieldMinLength_(value, validationRules) ||
return this.validateFieldRequired_(value, validationRules, formData, fieldName) ||
this.validateFieldMinimum_(value, validationRules, formData, fieldName) ||
this.validateFieldMaximum_(value, validationRules, formData, fieldName) ||
this.validateFieldIncrement_(value, validationRules) ||
this.validateFieldMaximum_(value, validationRules) ||
this.validateFieldMinLength_(value, validationRules) ||
this.validateFieldMaxLength_(value, validationRules) ||
this.validateFieldType_(value, validationRules) ||
this.validateFieldPattern_(value, validationRules) ||
Expand Down Expand Up @@ -2637,14 +2653,14 @@ var formFor;
}
return null;
};
ModelValidator.prototype.validateFieldMaximum_ = function (value, validationRules) {
ModelValidator.prototype.validateFieldMaximum_ = function (value, validationRules, formData, fieldName) {
if (validationRules.maximum) {
var stringValue = value.toString();
var numericValue = Number(value);
var maximum = angular.isObject(validationRules.maximum)
? validationRules.maximum.rule
: angular.isFunction(validationRules.maximum)
? validationRules.maximum.call(this, value)
? validationRules.maximum.call(this, value, formData, fieldName)
: validationRules.maximum;
if (stringValue && !isNaN(numericValue) && numericValue > maximum) {
var failureMessage;
Expand Down Expand Up @@ -2679,14 +2695,14 @@ var formFor;
}
return null;
};
ModelValidator.prototype.validateFieldMinimum_ = function (value, validationRules) {
ModelValidator.prototype.validateFieldMinimum_ = function (value, validationRules, formData, fieldName) {
if (validationRules.minimum) {
var stringValue = value.toString();
var numericValue = Number(value);
var minimum = angular.isObject(validationRules.minimum)
? validationRules.minimum.rule
: angular.isFunction(validationRules.minimum)
? validationRules.minimum.call(this, value)
? validationRules.minimum.call(this, value, formData, fieldName)
: validationRules.minimum;
if (stringValue && !isNaN(numericValue) && numericValue < minimum) {
var failureMessage;
Expand Down Expand Up @@ -2721,12 +2737,12 @@ var formFor;
}
return null;
};
ModelValidator.prototype.validateFieldRequired_ = function (value, validationRules) {
ModelValidator.prototype.validateFieldRequired_ = function (value, validationRules, formData, fieldName) {
if (validationRules.required) {
var required = angular.isObject(validationRules.required)
? validationRules.required.rule
: angular.isFunction(validationRules.required)
? validationRules.required.call(this, value)
? validationRules.required.call(this, value, formData, fieldName)
: validationRules.required;
// Compare both string and numeric values to avoid rejecting non-empty but falsy values (e.g. 0).
var stringValue = value.toString().replace(/\s+$/, ''); // Disallow an all-whitespace string
Expand Down Expand Up @@ -2916,20 +2932,4 @@ var formFor;
})();
formFor.StringUtil = StringUtil;
})(formFor || (formFor = {}));
var formFor;
(function (formFor) {
/**
* Wrapper object for a form-field attribute that exposes field-state to field directives.
*
* <p>Note that this interface exists for type-checking only; nothing actually implements this interface.
*/
var BindableFieldWrapper = (function () {
function BindableFieldWrapper() {
}
return BindableFieldWrapper;
})();
formFor.BindableFieldWrapper = BindableFieldWrapper;
;
})(formFor || (formFor = {}));
;
/// <reference path="../../../definitions/angular.d.ts" />
4 changes: 2 additions & 2 deletions dist/form-for.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/form-for.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions source/services/model-validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@ module formFor {
value = ""; // Escape falsy values liked null or undefined, but not ones like 0
}

return this.validateFieldRequired_(value, validationRules) ||
this.validateFieldMinimum_(value, validationRules) ||
this.validateFieldMinLength_(value, validationRules) ||
return this.validateFieldRequired_(value, validationRules, formData, fieldName) ||
this.validateFieldMinimum_(value, validationRules, formData, fieldName) ||
this.validateFieldMaximum_(value, validationRules, formData, fieldName) ||
this.validateFieldIncrement_(value, validationRules) ||
this.validateFieldMaximum_(value, validationRules) ||
this.validateFieldMinLength_(value, validationRules) ||
this.validateFieldMaxLength_(value, validationRules) ||
this.validateFieldType_(value, validationRules) ||
this.validateFieldPattern_(value, validationRules) ||
Expand Down Expand Up @@ -362,15 +362,15 @@ module formFor {
return null;
}

private validateFieldMaximum_(value:any, validationRules:ValidationRules):any {
private validateFieldMaximum_(value:any, validationRules:ValidationRules, formData:any, fieldName:any):any {
if (validationRules.maximum) {
var stringValue:string = value.toString();
var numericValue:number = Number(value);

var maximum:number = angular.isObject(validationRules.maximum)
? (<ValidationRuleNumber> validationRules.maximum).rule
: angular.isFunction(validationRules.maximum)
? validationRules.maximum.call(this, value)
? validationRules.maximum.call(this, value, formData, fieldName)
: <number> validationRules.maximum;

if (stringValue && !isNaN(numericValue) && numericValue > maximum) {
Expand Down Expand Up @@ -417,15 +417,15 @@ module formFor {
return null;
}

private validateFieldMinimum_(value:any, validationRules:ValidationRules):any {
private validateFieldMinimum_(value:any, validationRules:ValidationRules, formData:any, fieldName:any):any {
if (validationRules.minimum) {
var stringValue:string = value.toString();
var numericValue:number = Number(value);

var minimum:number = angular.isObject(validationRules.minimum)
? (<ValidationRuleNumber> validationRules.minimum).rule
: angular.isFunction(validationRules.minimum)
? validationRules.minimum.call(this, value)
? validationRules.minimum.call(this, value, formData, fieldName)
: <number> validationRules.minimum;

if (stringValue && !isNaN(numericValue) && numericValue < minimum) {
Expand Down Expand Up @@ -472,12 +472,12 @@ module formFor {
return null;
}

private validateFieldRequired_(value:any, validationRules:ValidationRules):any {
private validateFieldRequired_(value:any, validationRules:ValidationRules, formData:any, fieldName:any):any {
if (validationRules.required) {
var required:boolean = angular.isObject(validationRules.required)
? (<ValidationRuleBoolean> validationRules.required).rule
: angular.isFunction(validationRules.required)
? validationRules.required.call(this, value)
? validationRules.required.call(this, value, formData, fieldName)
: <boolean> validationRules.required;

// Compare both string and numeric values to avoid rejecting non-empty but falsy values (e.g. 0).
Expand Down