This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new f61b4bc make Jewel validators can use triggerEvent. default is
Event.CHANGE, but now can be switched to other one
f61b4bc is described below
commit f61b4bcdff0308807f373ab6fa691819db6a59fe
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Wed Dec 5 01:09:57 2018 +0100
make Jewel validators can use triggerEvent. default is Event.CHANGE, but
now can be switched to other one
---
.../jewel/beads/validators/CheckBoxValidator.as | 2 +-
.../royale/jewel/beads/validators/DateValidator.as | 2 +-
.../royale/jewel/beads/validators/FormValidator.as | 51 ---------------------
.../jewel/beads/validators/RadioButtonValidator.as | 2 +-
.../beads/validators/SelectedItemNullValidator.as | 2 +-
.../jewel/beads/validators/StringValidator.as | 6 +--
.../royale/jewel/beads/validators/Validator.as | 53 ++++++++++++++++++++++
7 files changed, 60 insertions(+), 58 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/CheckBoxValidator.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/CheckBoxValidator.as
index 9fec11a..722e640 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/CheckBoxValidator.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/CheckBoxValidator.as
@@ -58,7 +58,7 @@ package org.apache.royale.jewel.beads.validators
override public function set strand(value:IStrand):void
{
super.strand = value;
- hostComponent.addEventListener(Event.CHANGE, validate,
false);
+ hostComponent.addEventListener(triggerEvent, validate,
false);
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/DateValidator.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/DateValidator.as
index 4117411..d96cab2 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/DateValidator.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/DateValidator.as
@@ -58,7 +58,7 @@ package org.apache.royale.jewel.beads.validators
override public function set strand(value:IStrand):void
{
super.strand = value;
- hostComponent.addEventListener(Event.CHANGE, validate,
false);
+ hostComponent.addEventListener(triggerEvent, validate,
false);
}
private function isValidDate(d:*):Boolean
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/FormValidator.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/FormValidator.as
index e3eec2f..f6b3bf9 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/FormValidator.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/FormValidator.as
@@ -49,57 +49,6 @@ package org.apache.royale.jewel.beads.validators
super.requiredFieldError = null;
}
- private var _trigger:IEventDispatcher;
-
- public function get trigger():IEventDispatcher
- {
- return _trigger;
- }
-
- /**
- * Specifies the component generating the event that triggers
the validator.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function set trigger(value:IEventDispatcher):void
- {
- if (_triggerEvent) {
- if (_trigger)
-
_trigger.removeEventListener(_triggerEvent, validate);
-
- if (value)
- value.addEventListener(_triggerEvent,
validate);
- }
- _trigger = value;
- }
- private var _triggerEvent:String;
-
- public function get triggerEvent():String
- {
- return _triggerEvent;
- }
- /**
- * Specifies the event that triggers the validation.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function set triggerEvent(value:String):void
- {
- if (_trigger) {
- if (_triggerEvent)
-
_trigger.removeEventListener(_triggerEvent, validate);
- if (value)
- _trigger.addEventListener(value,
validate);
- }
- _triggerEvent = value;
- }
-
private var _isError:Boolean;
/**
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/RadioButtonValidator.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/RadioButtonValidator.as
index 3e8f660..ae26b70 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/RadioButtonValidator.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/RadioButtonValidator.as
@@ -60,7 +60,7 @@ package org.apache.royale.jewel.beads.validators
super.strand = value;
COMPILE::JS
{
- hostComponent.addEventListener(Event.CHANGE,
validate, false);
+ hostComponent.addEventListener(triggerEvent,
validate, false);
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/SelectedItemNullValidator.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/SelectedItemNullValidator.as
index 374d72a..053ba74 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/SelectedItemNullValidator.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/SelectedItemNullValidator.as
@@ -59,7 +59,7 @@ package org.apache.royale.jewel.beads.validators
override public function set strand(value:IStrand):void
{
super.strand = value;
- hostComponent.addEventListener(Event.CHANGE, validate,
false);
+ hostComponent.addEventListener(triggerEvent, validate,
false);
}
/**
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/StringValidator.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/StringValidator.as
index eeacdb1..0d219e2 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/StringValidator.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/StringValidator.as
@@ -63,7 +63,7 @@ package org.apache.royale.jewel.beads.validators
super.strand = value;
COMPILE::JS
{
- hostComponent.addEventListener(Event.CHANGE,
validate, false);
+ hostComponent.addEventListener(triggerEvent,
validate);
updateHost();
}
}
@@ -143,8 +143,8 @@ package org.apache.royale.jewel.beads.validators
if (hostComponent)
{
(_maxLength > 0) ?
- hostComponent.element.setAttribute('maxlength',
_maxLength) :
-
hostComponent.element.removeAttribute('maxlength');
+
hostComponent.element.setAttribute('maxlength', _maxLength) :
+
hostComponent.element.removeAttribute('maxlength');
}
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/Validator.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/Validator.as
index 383ef14..ee4e0e0 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/Validator.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/validators/Validator.as
@@ -23,6 +23,7 @@ package org.apache.royale.jewel.beads.validators
import org.apache.royale.core.IStrand;
import org.apache.royale.core.UIBase;
import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.geom.Point;
import org.apache.royale.jewel.supportClasses.tooltip.ErrorTipLabel;
import org.apache.royale.utils.PointUtils;
@@ -65,6 +66,57 @@ package org.apache.royale.jewel.beads.validators
protected var hostComponent:UIBase;
+ private var _trigger:IEventDispatcher;
+ /**
+ * Specifies the component generating the event that triggers
the validator.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.4
+ */
+ public function get trigger():IEventDispatcher
+ {
+ return _trigger;
+ }
+ public function set trigger(value:IEventDispatcher):void
+ {
+ if (_triggerEvent) {
+ if (_trigger)
+
_trigger.removeEventListener(_triggerEvent, validate);
+
+ if (value)
+ value.addEventListener(_triggerEvent,
validate);
+ }
+ _trigger = value;
+ }
+
+ private var _triggerEvent:String = Event.CHANGE;
+ /**
+ * Specifies the event that triggers the validation.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.4
+ */
+ [Bindable(event="triggerEventChanged")]
+ public function get triggerEvent():String
+ {
+ return _triggerEvent;
+ }
+ public function set triggerEvent(value:String):void
+ {
+ if (_trigger) {
+ if (_triggerEvent)
+
_trigger.removeEventListener(_triggerEvent, validate);
+ if (value)
+ _trigger.addEventListener(value,
validate);
+ }
+ _triggerEvent = value;
+ hostComponent.dispatchEvent(new
Event("triggerEventChanged"));
+ }
+
COMPILE::JS
protected var hostClassList:DOMTokenList;
@@ -80,6 +132,7 @@ package org.apache.royale.jewel.beads.validators
public function set strand(value:IStrand):void
{
hostComponent = value as UIBase;
+ _trigger = hostComponent;
COMPILE::JS
{
hostClassList =
hostComponent.positioner.classList;
