Skip to content

Simplified flow #30

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

Merged
shankarThiyagaraajan merged 2 commits into from
Jul 20, 2017
Merged

Simplified flow #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fe8fbd
- Simplified flow.
Jul 20, 2017
6fbae99
Merge remote-tracking branch 'origin/dev' into dev
Jul 20, 2017
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
54 changes: 15 additions & 39 deletions src/js/formValidator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,20 @@ var jsValidator = {
* Common Filter instances.
*/
var jsFilter = {
// Number elements filter listener.
number: function (element) {
var status = true;
checkStatus: function (elem) {
var status;
status = true;
if (false === this.forceFilter) {
status = false;
if (true === element.required) {
if (true === elem.required) {
status = true;
}
}
return status;
},
// Number elements filter listener.
number: function (element) {
var status = this.checkStatus(element);
if (true === status) element.addEventListener('keypress', this.isNumberKey, false);
},
/*
Expand All @@ -236,14 +241,9 @@ var jsFilter = {
// Getting "data" attribute for actions.
var type = element.getAttribute('data-allow');
var current = this;
var status = true;
if (false === this.forceFilter) {
status = false;
if (true === element.required) {
status = true;
}
} // Switching actions.
var status = this.checkStatus(element);

// Switching actions.
switch (type) {
// Allow only alphabets [a-zA-Z] not [0-9] and special characters.
case 'onlyAlpha':
Expand All @@ -264,49 +264,25 @@ var jsFilter = {
*/
pattern: function (element) {
var current = this;
var status = true;
if (false === this.forceFilter) {
status = false;
if (true === element.required) {
status = true;
}
}
var status = this.checkStatus(element);
if (true === status) element.addEventListener('keypress', current.isPatternValid, false);
},
/*
* Email elements filter listener.
*/
email: function (element) {
var status = true;
if (false === this.forceFilter) {
status = false;
if (true === element.required) {
status = true;
}
}
var status = this.checkStatus(element);
if (true === status) element.addEventListener('keypress', jsRuleSets.email, false);
},
file: function (element) {
var status = true;
if (false === this.forceFilter) {
status = false;
if (true === element.required) {
status = true;
}
}
var status = this.checkStatus(element);
if (true === status) element.addEventListener('change', jsRuleSets.file, false);
},
/*
* Numeric with Limited elements filter listener.
*/
limit: function (element) {
var status = true;
if (false === this.forceFilter) {
status = false;
if (true === element.required) {
status = true;
}
}
var status = this.checkStatus(element);
if (true === status) element.addEventListener('input', this.isInLimit, false);
},
/*
Expand Down