You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/09/01 10:46:37 UTC
[royale-asjs] branch develop updated: some fixes to validators to
remove warnings and update version numbers for next release
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 a453575 some fixes to validators to remove warnings and update version numbers for next release
a453575 is described below
commit a45357592187ea43a97764d924aeb3d415f6f3b5
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Sep 1 12:46:32 2018 +0200
some fixes to validators to remove warnings and update version numbers for next release
---
.../src/main/royale/TextInputPlayGround.mxml | 47 +++++-----------------
.../royale/org/apache/royale/jewel/ErrorTip.as | 10 ++---
.../royale/jewel/beads/controls/Validator.as | 28 ++++++-------
.../beads/controls/group/CheckBoxValidator.as | 8 ++--
.../jewel/beads/controls/group/FormValidator.as | 12 +++---
.../beads/controls/group/RadioButtonValidator.as | 10 ++---
.../beads/controls/textinput/StringValidator.as | 12 +++---
.../royale/jewel/beads/layouts/GridLayout.as | 2 +-
8 files changed, 51 insertions(+), 78 deletions(-)
diff --git a/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
index 4bd6d80..fd3d78f 100644
--- a/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/TextInputPlayGround.mxml
@@ -211,7 +211,7 @@ limitations under the License.
</j:TextInput>
<html:H4 text="Favorite movies (at least 2)"/>
- <j:Group>
+ <j:VGroup gap="3">
<j:beads>
<j:CheckBoxValidator required="2" requiredFieldError="Please choose at least 2 movies"/>
</j:beads>
@@ -220,7 +220,7 @@ limitations under the License.
<j:CheckBox text="Scent of a woman"/>
<j:CheckBox text="Star Wars"/>
<j:CheckBox text="The Shawshank Redemption"/>
- </j:Group>
+ </j:VGroup>
<html:H4 text="Verification code: {randomCode}"/>
<j:HGroup gap="3">
@@ -236,52 +236,25 @@ limitations under the License.
</j:HGroup>
</j:Form>
-
- <!-- <j:Group>
- <j:beads>
- <j:HorizontalLayout gap="3"/>
- </j:beads>
- <j:Button text="Check it!" emphasis="primary"/>
- <j:TextInput text="A TextInput"/>
- </j:Group>
-
- <j:Group>
- <j:beads>
- <j:HorizontalLayout gap="3"/>
- </j:beads>
- <j:TextInput>
- <j:beads>
- <j:TextPrompt prompt="With prompt..."/>
- </j:beads>
- </j:TextInput>
- <j:Button text="Send" emphasis="secondary"/>
- </j:Group>
-
- <j:TextInput text="Disabled with text...">
- <j:beads>
- <j:TextPrompt prompt="Disabled TextInput..."/>
- <j:Disabled/>
- </j:beads>
- </j:TextInput>
-
- <j:TextInput>
- <j:beads>
- <j:TextPrompt prompt="Disabled with prompt..."/>
- <j:Disabled/>
- </j:beads>
- </j:TextInput> -->
</j:Card>
</j:GridCell>
</j:Grid>
<fx:Script>
<![CDATA[
+ import org.apache.royale.utils.StringPadder;
+ import org.apache.royale.jewel.Alert;
+
[Bindable]
- private var randomCode:String = String(Math.round(Math.random() * 10000)).padStart(5, "0");
+ public var randomCode:String = StringPadder.pad(String(Math.round(Math.random() * 10000)), "0", 5);
public function customValidate(host:TextInput):String {
return (host.text == randomCode) ? "" : "The entered code doesn't match" + randomCode;
}
+
+ public function doSummit(event:Event):void {
+ Alert.show("Data is valid submitted");
+ }
]]>
</fx:Script>
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ErrorTip.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ErrorTip.as
index 76cd5f7..1e736d0 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ErrorTip.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ErrorTip.as
@@ -35,7 +35,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public class ErrorTip extends StyledUIBase
{
@@ -45,7 +45,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function ErrorTip()
{
@@ -69,7 +69,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function get text():String
{
@@ -109,7 +109,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function get html():String
{
@@ -146,7 +146,7 @@ package org.apache.royale.jewel
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function get multiline():Boolean
{
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Validator.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Validator.as
index 64d712f..800fa0e 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Validator.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Validator.as
@@ -36,7 +36,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public class Validator implements IBead
{
@@ -46,7 +46,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function Validator()
{
@@ -74,7 +74,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
* @royaleignorecoercion org.apache.royale.events.IEventDispatcher
*/
public function set strand(value:IStrand):void
@@ -91,7 +91,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function get isError():Boolean {
return (_errorTip != null);
@@ -107,7 +107,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
private var _validateFunction:Function;
@@ -120,7 +120,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function set validateFunction(func:Function):void{
_validateFunction = func;
@@ -138,7 +138,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function set required(value:int):void {
_required = value;
@@ -151,7 +151,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function get requiredFieldError():String
{
@@ -170,7 +170,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function validate(event:Event = null):Boolean {
if (validateFunction) {
@@ -194,7 +194,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function set xPos(pos:int):void
{
@@ -208,7 +208,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function set yPos(pos:int):void
{
@@ -222,7 +222,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
protected function createErrorTip(errorText:String):void
{
@@ -257,7 +257,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
protected function determinePosition():Point
{
@@ -297,7 +297,7 @@ package org.apache.royale.jewel.beads.controls
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
protected function destroyErrorTip():void
{
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/CheckBoxValidator.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/CheckBoxValidator.as
index 12208a9..270b538 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/CheckBoxValidator.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/CheckBoxValidator.as
@@ -31,7 +31,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public class CheckBoxValidator extends Validator
{
@@ -41,7 +41,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function CheckBoxValidator()
{
@@ -54,7 +54,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
* @royaleignorecoercion org.apache.royale.events.IEventDispatcher
*/
override public function set strand(value:IStrand):void
@@ -73,7 +73,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
override public function validate(event:Event = null):Boolean {
if (super.validate(event)) {
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/FormValidator.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/FormValidator.as
index dc62869..e13bfc2 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/FormValidator.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/FormValidator.as
@@ -33,7 +33,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public class FormValidator extends Validator
{
@@ -43,7 +43,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function FormValidator()
{
@@ -64,7 +64,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function set trigger(value:IEventDispatcher):void
{
@@ -89,7 +89,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function set triggerEvent(value:String):void
{
@@ -110,7 +110,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
override public function get isError():Boolean {
return _isError;
@@ -123,7 +123,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
override public function validate(event:Event = null):Boolean {
_isError = false;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/RadioButtonValidator.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/RadioButtonValidator.as
index cf79dbf..6accacb 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/RadioButtonValidator.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/group/RadioButtonValidator.as
@@ -31,7 +31,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public class RadioButtonValidator extends Validator
{
@@ -41,7 +41,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function RadioButtonValidator()
{
@@ -54,7 +54,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
* @royaleignorecoercion org.apache.royale.events.IEventDispatcher
*/
override public function set strand(value:IStrand):void
@@ -79,7 +79,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function set groupName(value:String):void
{
@@ -92,7 +92,7 @@ package org.apache.royale.jewel.beads.controls.group
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
override public function validate(event:Event = null):Boolean {
if (super.validate(event)) {
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/StringValidator.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/StringValidator.as
index 41a14bf..422f5de 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/StringValidator.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/StringValidator.as
@@ -32,7 +32,7 @@ package org.apache.royale.jewel.beads.controls.textinput
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public class StringValidator extends Validator implements IBead
{
@@ -42,7 +42,7 @@ package org.apache.royale.jewel.beads.controls.textinput
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function StringValidator()
{
@@ -56,7 +56,7 @@ package org.apache.royale.jewel.beads.controls.textinput
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
* @royaleignorecoercion org.apache.royale.events.IEventDispatcher
*/
override public function set strand(value:IStrand):void
@@ -81,7 +81,7 @@ package org.apache.royale.jewel.beads.controls.textinput
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function set autoTrim(value:Boolean):void
{
@@ -100,7 +100,7 @@ package org.apache.royale.jewel.beads.controls.textinput
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
public function set maxLength(value:int):void
{
@@ -117,7 +117,7 @@ package org.apache.royale.jewel.beads.controls.textinput
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
override public function validate(event:Event = null):Boolean {
var txt:TextInputBase = hostComponent as TextInputBase;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridLayout.as
index cccc0ea..c2a1828 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridLayout.as
@@ -140,7 +140,7 @@ package org.apache.royale.jewel.beads.layouts
// }
// /**
- // * @private
+ // *
// */
// public function set gap(value:Number):void
// {