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 9f6db6f examples: fix some of the failing examples due to prefixes
not matching parent prefix tag
9f6db6f is described below
commit 9f6db6f6225512097a00ccd3010ac1535f186cbe
Author: Carlos Rovira <[email protected]>
AuthorDate: Sun Dec 15 20:47:21 2019 +0100
examples: fix some of the failing examples due to prefixes not matching
parent prefix tag
---
.../RemoteObjectAMFTest/src/main/royale/App.mxml | 2 +-
.../src/main/royale/CreateJSExample.mxml | 16 ++++++------
.../src/main/royale/TabsExample.mxml | 8 +++---
.../MobileMap/src/main/royale/MobileMap.mxml | 12 ++++++---
.../MobileStocks/src/main/royale/MobileStocks.mxml | 29 +++++++++++-----------
.../RemoteObjectAMFTest/src/main/royale/App.mxml | 4 +--
6 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/examples/mxroyale/RemoteObjectAMFTest/src/main/royale/App.mxml
b/examples/mxroyale/RemoteObjectAMFTest/src/main/royale/App.mxml
index a68c15b..4b0def6 100644
--- a/examples/mxroyale/RemoteObjectAMFTest/src/main/royale/App.mxml
+++ b/examples/mxroyale/RemoteObjectAMFTest/src/main/royale/App.mxml
@@ -176,7 +176,7 @@ limitations under the License.
destination="exampleService">
<mx:method name="echo">
<mx:arguments>
- <symbol>{name_txt.text}</symbol>
+ <mx:symbol>{name_txt.text}</mx:symbol><!-- this tag has no
prefix, so fails to compile -->
</mx:arguments>
</mx:method>
<mx:method name="getObjectArray1">
diff --git
a/examples/royale/CreateJSExample/src/main/royale/CreateJSExample.mxml
b/examples/royale/CreateJSExample/src/main/royale/CreateJSExample.mxml
index 5f08b02..44f540d 100644
--- a/examples/royale/CreateJSExample/src/main/royale/CreateJSExample.mxml
+++ b/examples/royale/CreateJSExample/src/main/royale/CreateJSExample.mxml
@@ -24,13 +24,13 @@ limitations under the License.
applicationComplete="seq.play()"
>
- <js:valuesImpl>
+ <cjs:valuesImpl>
<js:SimpleCSSValuesImpl />
- </js:valuesImpl>
+ </cjs:valuesImpl>
- <js:beads>
+ <cjs:beads>
<js:ApplicationDataBinding />
- </js:beads>
+ </cjs:beads>
<fx:Declarations>
<cjs:Sequence id="seq" target="circle" loop="true">
@@ -54,16 +54,16 @@ limitations under the License.
]]>
</fx:Script>
- <js:initialView>
+ <cjs:initialView>
<cjs:View>
<cjs:Circle id="circle" x="100" y="100" radius="50">
- <js:fill>
+ <cjs:fill>
<js:SolidColor color="#26C9FF" />
- </js:fill>
+ </cjs:fill>
</cjs:Circle>
</cjs:View>
- </js:initialView>
+ </cjs:initialView>
</cjs:Application>
diff --git
a/examples/royale/MDLDynamicTabsExample/src/main/royale/TabsExample.mxml
b/examples/royale/MDLDynamicTabsExample/src/main/royale/TabsExample.mxml
index 8d9054d..c200560 100644
--- a/examples/royale/MDLDynamicTabsExample/src/main/royale/TabsExample.mxml
+++ b/examples/royale/MDLDynamicTabsExample/src/main/royale/TabsExample.mxml
@@ -24,13 +24,13 @@ limitations under the License.
<fx:Style source="../../main/resources/mdl-styles.css"/>
- <js:valuesImpl>
+ <mdl:valuesImpl>
<js:SimpleCSSValuesImpl/>
- </js:valuesImpl>
+ </mdl:valuesImpl>
- <js:initialView>
+ <mdl:initialView>
<js:View>
<views:InitialView/>
</js:View>
- </js:initialView>
+ </mdl:initialView>
</mdl:Application>
diff --git a/examples/royale/MobileMap/src/main/royale/MobileMap.mxml
b/examples/royale/MobileMap/src/main/royale/MobileMap.mxml
index 847b0bc..b7dc377 100644
--- a/examples/royale/MobileMap/src/main/royale/MobileMap.mxml
+++ b/examples/royale/MobileMap/src/main/royale/MobileMap.mxml
@@ -22,9 +22,11 @@ limitations under the License.
xmlns:mjs="library://ns.apache.org/royale/cordova"
xmlns:google="library://ns.apache.org/royale/google"
applicationComplete="onDeviceReady()">
- <js:valuesImpl>
+
+ <mjs:valuesImpl>
<js:SimpleCSSValuesImpl />
- </js:valuesImpl>
+ </mjs:valuesImpl>
+
<fx:Script>
<![CDATA[
import org.apache.royale.cordova.geolocation.Geolocation;
@@ -56,7 +58,8 @@ limitations under the License.
}
]]>
</fx:Script>
- <js:initialView>
+
+ <mjs:initialView>
<js:View>
<js:VContainer width="450" height="640">
<js:HContainer width="100%" height="40">
@@ -67,5 +70,6 @@ limitations under the License.
token="AIzaSyDkQgg2iojLCYeuW6hK7DkuAHD-SwJJhdE" />
</js:VContainer>
</js:View>
- </js:initialView>
+ </mjs:initialView>
+
</mjs:Application>
diff --git a/examples/royale/MobileStocks/src/main/royale/MobileStocks.mxml
b/examples/royale/MobileStocks/src/main/royale/MobileStocks.mxml
index 668a052..e04fed1 100644
--- a/examples/royale/MobileStocks/src/main/royale/MobileStocks.mxml
+++ b/examples/royale/MobileStocks/src/main/royale/MobileStocks.mxml
@@ -17,34 +17,33 @@ See the License for the specific language governing
permissions and
limitations under the License.
-->
-<cordova:Application xmlns:fx="http://ns.adobe.com/mxml/2009";
+<c:Application xmlns:fx="http://ns.adobe.com/mxml/2009";
xmlns:local="*"
xmlns:models="models.*"
xmlns:views="views.*"
xmlns:js="library://ns.apache.org/royale/basic"
-
xmlns:cordova="library://ns.apache.org/royale/cordova"
- >
+
xmlns:c="library://ns.apache.org/royale/cordova">
+
<fx:Declarations>
<!-- Place non-visual elements (e.g., services, value objects)
here -->
</fx:Declarations>
- <js:valuesImpl>
+ <c:valuesImpl>
<js:SimpleCSSValuesImpl />
- </js:valuesImpl>
+ </c:valuesImpl>
- <js:model>
+ <c:model>
<models:ProductsModel />
- </js:model>
+ </c:model>
- <js:initialView>
+ <c:initialView>
<local:MyInitialView width="100%" height="100%"
className="InitalView" />
- </js:initialView>
+ </c:initialView>
- <js:beads>
- <cordova:Weinre guid="aharui" />
+ <c:beads>
+ <c:Weinre guid="aharui" />
<js:MixinManager />
<js:DeviceSizeBead />
- </js:beads>
-
-
-</cordova:Application>
+ </c:beads>
+
+</c:Application>
diff --git a/examples/royale/RemoteObjectAMFTest/src/main/royale/App.mxml
b/examples/royale/RemoteObjectAMFTest/src/main/royale/App.mxml
index 9c0216a..691f994 100644
--- a/examples/royale/RemoteObjectAMFTest/src/main/royale/App.mxml
+++ b/examples/royale/RemoteObjectAMFTest/src/main/royale/App.mxml
@@ -155,9 +155,9 @@ limitations under the License.
<j:initialView>
<j:View>
- <js:beads>
+ <j:beads>
<j:VerticalLayout gap="10"/>
- </js:beads>
+ </j:beads>
<html:H3 text="RemoteObject AMF Test"/>
