You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2017/12/04 19:19:00 UTC
[royale-asjs] 01/02: Fixed SWF build
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 43271485504406bd9f1f8fe0bf57dd86c8481208
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Dec 4 21:18:35 2017 +0200
Fixed SWF build
---
.../org/apache/royale/html/elements/Button.as | 23 ++++------------------
.../royale/org/apache/royale/html/elements/Col.as | 4 ++--
.../org/apache/royale/html/elements/Colgroup.as | 4 ++--
.../royale/org/apache/royale/html/elements/Form.as | 23 ++++------------------
.../org/apache/royale/html/elements/Input.as | 23 ++++------------------
ide/IDEA/intellij-config.xml | 4 ++--
6 files changed, 18 insertions(+), 63 deletions(-)
diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Button.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Button.as
index 86d64fc..5900a3a 100644
--- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Button.as
+++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Button.as
@@ -126,8 +126,6 @@ package org.apache.royale.html.elements
}
}
- COMPILE::SWF
- private var _name:String;
/**
* The button name
*
@@ -136,28 +134,15 @@ package org.apache.royale.html.elements
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
+ COMPILE::JS
public function get name():String
{
- COMPILE::SWF
- {
- return _name;
- }
-
- COMPILE::JS
- {
- return button.name;
- }
+ return button.name;
}
+ COMPILE::JS
public function set name(value:String):void
{
- COMPILE::SWF
- {
- _name = value;
- }
- COMPILE::JS
- {
- button.name = value;
- }
+ button.name = value;
}
COMPILE::SWF
diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Col.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Col.as
index 6ed2278..129e0ec 100644
--- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Col.as
+++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Col.as
@@ -63,7 +63,7 @@ package org.apache.royale.html.elements
{
COMPILE::SWF
{
- return _src;
+ return _span;
}
COMPILE::JS
{
@@ -74,7 +74,7 @@ package org.apache.royale.html.elements
{
COMPILE::SWF
{
- _src = value;
+ _span = value;
}
COMPILE::JS
diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Colgroup.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Colgroup.as
index 93cac6b..7b15b23 100644
--- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Colgroup.as
+++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Colgroup.as
@@ -63,7 +63,7 @@ package org.apache.royale.html.elements
{
COMPILE::SWF
{
- return _src;
+ return _span;
}
COMPILE::JS
{
@@ -74,7 +74,7 @@ package org.apache.royale.html.elements
{
COMPILE::SWF
{
- _src = value;
+ _span = value;
}
COMPILE::JS
diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Form.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Form.as
index 56befcf..4d13374 100644
--- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Form.as
+++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Form.as
@@ -93,8 +93,6 @@ package org.apache.royale.html.elements
}
}
- COMPILE::SWF
- private var _name:String;
/**
* The form name
*
@@ -103,28 +101,15 @@ package org.apache.royale.html.elements
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
+ COMPILE::JS
public function get name():String
{
- COMPILE::SWF
- {
- return _name;
- }
-
- COMPILE::JS
- {
- return form.name;
- }
+ return form.name;
}
+ COMPILE::JS
public function set name(value:String):void
{
- COMPILE::SWF
- {
- _name = value;
- }
- COMPILE::JS
- {
- form.name = value;
- }
+ form.name = value;
}
COMPILE::SWF
diff --git a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Input.as b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Input.as
index 34414a7..7bb39aa 100644
--- a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Input.as
+++ b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/elements/Input.as
@@ -126,8 +126,6 @@ package org.apache.royale.html.elements
}
}
- COMPILE::SWF
- private var _name:String;
/**
* The input name
*
@@ -136,28 +134,15 @@ package org.apache.royale.html.elements
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
+ COMPILE::JS
public function get name():String
{
- COMPILE::SWF
- {
- return _name;
- }
-
- COMPILE::JS
- {
- return input.name;
- }
+ return input.name;
}
+ COMPILE::JS
public function set name(value:String):void
{
- COMPILE::SWF
- {
- _name = value;
- }
- COMPILE::JS
- {
- input.name = value;
- }
+ input.name = value;
}
COMPILE::SWF
diff --git a/ide/IDEA/intellij-config.xml b/ide/IDEA/intellij-config.xml
index 01b27db..77a0967 100644
--- a/ide/IDEA/intellij-config.xml
+++ b/ide/IDEA/intellij-config.xml
@@ -59,8 +59,8 @@
</namespace>
<namespace>
- <uri>library://ns.apache.org/royale/svg</uri>
- <manifest>../../frameworks/projects/HTML/src/main/resources/svg-manifest.xml</manifest>
+ <uri>library://ns.apache.org/royale/html</uri>
+ <manifest>../../frameworks/projects/HTML/src/main/resources/html-manifest.xml</manifest>
</namespace>
</namespaces>
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.