Skip to content

Commit d17ef61

Browse files
authored
Merge pull request #59 from peckadesign/58-remove-messages
58 remove messages
2 parents db69596 + 86eda21 commit d17ef61

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "pd-forms",
33
"title": "pdForms",
44
"description": "Customization of netteForms for use in PeckaDesign.",
5-
"version": "4.1.2",
5+
"version": "4.1.3",
66
"author": "PeckaDesign, s.r.o <[email protected]>",
77
"contributors": [
88
"Radek Šerý <[email protected]>",

src/assets/pdForms.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @name pdForms
33
* @author Radek Šerý <[email protected]>
4-
* @version 4.1.2
4+
* @version 4.1.3
55
*
66
* Features:
77
* - live validation
@@ -45,7 +45,7 @@
4545

4646
var pdForms = window.pdForms || {};
4747

48-
pdForms.version = '4.1.2';
48+
pdForms.version = '4.1.3';
4949

5050

5151
/**
@@ -159,11 +159,6 @@
159159

160160
validate.forEach(function(elem) {
161161
if (elem.getAttribute('data-pdforms-ever-focused')) {
162-
// assumes the input is valid, therefore removing all messages except those associated with ajax rules; this
163-
// prevents flashing of message, when ajax rule is evaluated - ajax rules removes their messages when the ajax
164-
// rule is evaluated
165-
pdForms.removeMessages(elem, false);
166-
167162
var rules = JSON.parse(elem.getAttribute('data-nette-rules') || '[]');
168163
rules = pdForms.normalizeRules(rules);
169164

@@ -625,6 +620,11 @@
625620
* validating. This means removing all properties but data from arg and storing them elsewhere.
626621
*/
627622
Nette.validateControl = function(elem, rules, onlyCheck, value, emptyOptional) {
623+
// assumes the input is valid, therefore removing all messages except those associated with ajax rules; this
624+
// prevents flashing of message, when ajax rule is evaluated - ajax rules removes their messages when the ajax
625+
// rule is evaluated
626+
pdForms.removeMessages(elem, false);
627+
628628
elem = elem.tagName ? elem : elem[0]; // RadioNodeList
629629

630630
if (! rules) {

0 commit comments

Comments
 (0)