Skip to content

Commit 22315b2

Browse files
author
Tom Hanoldt
committed
clear input events, rename elements -> elementsFor
1 parent cf0f153 commit 22315b2

File tree

1 file changed

+20
-10
lines changed

1 file changed

+20
-10
lines changed

src/input.validator.coffee

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ class @InputValidator
120120

121121
constructor: (@context, config={}) ->
122122
@config = @constructor.config
123+
@ns = 'inputvalidator'
123124
@init(config)
124125

125126
init: (config, context=null) =>
@@ -129,24 +130,33 @@ class @InputValidator
129130

130131
prepareElements: (context=null) =>
131132
context ?= @context
132-
133-
$elements = @elements(context)
133+
134+
$elements = @elementsFor(context)
134135
if @config.validateOnFocusOut
135-
$elements.focusout (e) => @validateElement(e.target)
136+
$elements
137+
.off("focusout.#{@ns}")
138+
.on("focusout.#{@ns}", (e) => @validateElement(e.target))
136139

137140
if @config.removeHintOnFocus
138-
$elements.focus (e) => @resetElement(e.target)
141+
$elements
142+
.off("focus.#{@ns}")
143+
.on("focus.#{@ns}", (e) => @resetElement(e.target))
139144

140145
if @config.validateOnKeyUp
141-
$elements.keyup (e) =>
142-
@validateElement(e.target) if $(e.target).data('invalid')
146+
$elements
147+
.off("keyup.#{@ns}")
148+
.on("keyup.#{@ns}", (e) =>
149+
@validateElement(e.target) if $(e.target).data('invalid')
150+
)
143151

144152
if @config.validateOnClick
145-
$elements.click (e) => @validateElement(e.target)
153+
$elements
154+
.off("click.#{@ns}")
155+
.on("click.#{@ns}", (e) => @validateElement(e.target))
146156

147157
validate: (context = null) =>
148158
errors = []
149-
$elements = @elements(context)
159+
$elements = @elementsFor(context)
150160
for element in $elements.get()
151161
errors = errors.concat(@validateElement(element))
152162

@@ -178,12 +188,12 @@ class @InputValidator
178188
errors
179189

180190
reset: (context = null) =>
181-
@resetElement(@elements(context))
191+
@resetElement(@elementsFor(context))
182192

183193
resetElement: ($element) =>
184194
@config.handler.onResetIntern(@, $element)
185195

186-
elements: (context = null) =>
196+
elementsFor: (context = null) =>
187197
context ?= @context
188198
$(@config.selectors.elements, context)
189199
.not(@config.selectors.ignore)

0 commit comments

Comments
 (0)