Skip to content

- New Action "Force Filter" implemented in both Native and ES6. #7

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.

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
merged 1 commit into from
May 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions src/demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,42 +43,42 @@
required>
</div>
<div>
<select required>
<select required name="select1">
<option value=""></option>
<option value="123">123</option>
</select>
</div>
<div>
<select required>
<select required name="select2">
<option value=""></option>
<option value="456">456</option>
</select>
</div>
<div>
<textarea required></textarea>
<textarea required name="text1"></textarea>
</div>
</div>
<input type="submit" value="Save">
</form>
</div>

<!--<script src="./../js/formValidator.min.js"></script>-->
<script src="./../js/validatorNew.js"></script>
<!--<script src="../js/validatorNew.es6.js"></script>-->
<!--<script src="./../js/validatorNew.js"></script>-->
<script src="../js/validatorNew.es6.js"></script>
<script>

(function () {

var val = jsValidator.init({
form: 'demoValidation',
onlyFilter: false
});

// var val = new jsValidator().init({
// var val = jsValidator.init({
// form: 'demoValidation',
// onlyFilter: false
// });

var val = new jsValidator().init({
form: 'demoValidation',
onlyFilter: false
});

}());
</script>
</body>
Expand Down
44 changes: 44 additions & 0 deletions src/demo/index2.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>

<form method="post" id="form2submit" novalidate>
<div>
<label></label>
<input type="text" data-allow="onlyAlpha" name="name1" required>
</div>
<div>
<label></label>
<input type="text" data-allow="onlyAlpha" name="name2">
</div>
<div>
<label></label>
<input type="text" data-allow="onlyAlpha" name="name3" required>
</div>
<div>
<label></label>
<input type="submit" value="Submit">
</div>
</form>

<script src="./../js/validatorNew.js"></script>
<!--<script src="./../js/validatorNew.es6.js"></script>-->
<script>

// var form = new jsValidator().init({
// form: 'form2submit',
// forceFilter: true
// });

var form = jsValidator.init({
form: 'form2submit',
forceFilter: false
});

</script>
</body>
</html>
12 changes: 7 additions & 5 deletions src/js/validatorNew.es6.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class jsValidator {
// To make listen on submit action of the form.
submitListener(formID, obj) {
// To off submit listener, if only filter needed.
if (false === this.onlyFilter) {
if (false === this.onlyFilter || typeof(this.onlyFilter) === 'undefined') {
// Initiate listener for form submission.
document.querySelector("#" + formID).addEventListener("submit", function (e) {

Expand Down Expand Up @@ -141,7 +141,7 @@ class jsValidator {
// Apply filter to element.
this.applyFilters(activeElem);
// If not only filter, then start validations.
if (false === this.onlyFilter) {
if (false === this.onlyFilter || 'undefined' === this.onlyFilter) {
// Initiate validations and update to log.
log = this.constructor.checkValidation(activeElem, log);
}
Expand Down Expand Up @@ -217,9 +217,11 @@ class jsValidator {
}
// If valid, then reset validation message.
if (true === validElem) {
let elem = document.getElementById(activeElem.name);
if (typeof(elem) !== 'undefined' && elem !== null) {
elem.innerHTML = '';
if (activeElem.name !== '') {
let elem = document.getElementById(activeElem.name);
if (typeof(elem) !== 'undefined' && elem !== null) {
elem.innerHTML = '';
}
}
}
// Return overall log report of validation.
Expand Down
Loading