This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch ace-editor
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/ace-editor by this push:
new 062e475 Looks like Ace library is working, not sure about swf
062e475 is described below
commit 062e475581eaf3f71cf5a7639fe6b2d00254da86
Author: DESKTOP-RH4S838\Yishay <[email protected]>
AuthorDate: Wed Apr 4 00:03:31 2018 +0300
Looks like Ace library is working, not sure about swf
---
build.xml | 8 +++
examples/royale/Ace/src/main/royale/ACEEditor.as | 63 ----------------------
examples/royale/Ace/src/main/royale/Ace.mxml | 6 +--
frameworks/ace-config-template.xml | 2 +-
.../{ace-config-template.xml => ace-config.xml} | 6 +--
.../AceJS/src/main/config/compile-js-config.xml | 1 -
frameworks/projects/Ace/build.xml | 3 +-
7 files changed, 17 insertions(+), 72 deletions(-)
diff --git a/build.xml b/build.xml
index 3434bc8..c9db345 100644
--- a/build.xml
+++ b/build.xml
@@ -444,6 +444,9 @@ limitations under the License.
<ant dir="${basedir}/frameworks" target="create-config">
<property name="configname" value="js" />
</ant>
+ <ant dir="${basedir}/frameworks" target="create-config">
+ <property name="configname" value="ace" />
+ </ant>
<ant dir="${basedir}/frameworks" target="create-config">
<property name="configname" value="jquery" />
</ant>
@@ -872,6 +875,8 @@ limitations under the License.
<fix-config-file
file="${staging-dir}/frameworks/js-config-template.xml"
version="${build.version}" />
<echo message="Updating config file jquery-config.xml with version
${build.version}"/>
<fix-config-file
file="${staging-dir}/frameworks/jquery-config-template.xml"
version="${build.version}" />
+ <echo message="Updating config file ace-config.xml with version
${build.version}"/>
+ <fix-config-file
file="${staging-dir}/frameworks/ace-config-template.xml"
version="${build.version}" />
<echo message="Updating config file createjs-config.xml with version
${build.version}"/>
<fix-config-file
file="${staging-dir}/frameworks/createjs-config-template.xml"
version="${build.version}" />
<echo message="Updating config file node-config.xml with version
${build.version}"/>
@@ -964,6 +969,7 @@ limitations under the License.
<include name="createjs-config.xml"/>
<include name="flex-config.xml"/>
<include name="jquery-config.xml"/>
+ <include name="ace-config.xml"/>
<include name="js-config.xml"/>
<include name="node-config.xml"/>
<include name="royale-config.xml"/>
@@ -977,6 +983,7 @@ limitations under the License.
<include name="createjs-config.xml"/>
<include name="flex-config.xml"/>
<include name="jquery-config.xml"/>
+ <include name="ace-config.xml"/>
<include name="js-config.xml"/>
<include name="node-config.xml"/>
<include name="royale-config.xml"/>
@@ -989,6 +996,7 @@ limitations under the License.
<include name="createjs-config.xml"/>
<include name="flex-config.xml"/>
<include name="jquery-config.xml"/>
+ <include name="ace-config.xml"/>
<include name="js-config.xml"/>
<include name="node-config.xml"/>
<include name="royale-config.xml"/>
diff --git a/examples/royale/Ace/src/main/royale/ACEEditor.as
b/examples/royale/Ace/src/main/royale/ACEEditor.as
deleted file mode 100644
index c16f688..0000000
--- a/examples/royale/Ace/src/main/royale/ACEEditor.as
+++ /dev/null
@@ -1,63 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package
-{
- import org.apache.royale.core.UIBase;
- COMPILE::JS {
- import ace.Editor;
- import ace.Document;
- }
- COMPILE::SWF
- public class ACEEditor extends org.apache.royale.core.UIBase
- {
- }
-
- COMPILE::JS
- public class ACEEditor extends org.apache.royale.core.UIBase
- {
- /**
- * <inject_html>
- * <script
src="https://cdn.rawgit.com/ajaxorg/ace-builds/master/src-min-noconflict/ace.js";></script>
- * </inject_html>
- */
- public function ACEEditor()
- {
- super();
- }
- private var editor:Editor;
-
- override public function addedToParent():void
- {
- super.addedToParent();
- editor = ace["edit"](id);
- }
-
- private var _theme:String;
- public function get theme():String
- {
- return _theme;
- }
-
- public function set theme(value:String):void
- {
- _theme = value;
- editor.setTheme(value);
- }
- }
-}
diff --git a/examples/royale/Ace/src/main/royale/Ace.mxml
b/examples/royale/Ace/src/main/royale/Ace.mxml
index 529289e..06f9da3 100644
--- a/examples/royale/Ace/src/main/royale/Ace.mxml
+++ b/examples/royale/Ace/src/main/royale/Ace.mxml
@@ -18,8 +18,8 @@ limitations under the License.
-->
<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009";
- xmlns:local="*"
- xmlns:js="library://ns.apache.org/royale/basic" >
+ xmlns:js="library://ns.apache.org/royale/basic"
+ xmlns:ace="library://ns.apache.org/royale/ace" >
<js:valuesImpl>
<js:SimpleCSSValuesImpl />
</js:valuesImpl>
@@ -27,7 +27,7 @@ limitations under the License.
<js:View>
<js:VContainer>
<js:Label text="Hello World!" />
- <local:ACEEditor id="myEditor" width="400"
height="400"/>
+ <ace:ACEEditor id="myEditor" width="400" height="400"/>
</js:VContainer>
</js:View>
</js:initialView>
diff --git a/frameworks/ace-config-template.xml
b/frameworks/ace-config-template.xml
index f34b131..eb1b412 100644
--- a/frameworks/ace-config-template.xml
+++ b/frameworks/ace-config-template.xml
@@ -58,7 +58,7 @@
<!-- linking.
-->
<external-library-path>
<path-element>../js/libs/js.swc</path-element>
- <path-element>../js/libs/ace.swc</path-element>
+ <path-element>../js/libs/ace-1.2.3.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are
generated by -->
diff --git a/frameworks/ace-config-template.xml b/frameworks/ace-config.xml
similarity index 99%
copy from frameworks/ace-config-template.xml
copy to frameworks/ace-config.xml
index f34b131..c20e68c 100644
--- a/frameworks/ace-config-template.xml
+++ b/frameworks/ace-config.xml
@@ -22,10 +22,10 @@
<royale-config>
<!-- Specifies the minimum player version that will run the compiled SWF.
-->
- <target-player>@playerversion@</target-player>
+ <target-player>11.1</target-player>
<!-- Specifies the version of the compiled SWF -->
- <swf-version>@swfversion@</swf-version>
+ <swf-version>14</swf-version>
<compiler>
<!-- build both SWF and JS. -->
@@ -58,7 +58,7 @@
<!-- linking.
-->
<external-library-path>
<path-element>../js/libs/js.swc</path-element>
- <path-element>../js/libs/ace.swc</path-element>
+ <path-element>../js/libs/ace-1.2.3.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are
generated by -->
diff --git a/frameworks/js/projects/AceJS/src/main/config/compile-js-config.xml
b/frameworks/js/projects/AceJS/src/main/config/compile-js-config.xml
index e8e3878..8af41d7 100644
--- a/frameworks/js/projects/AceJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/projects/AceJS/src/main/config/compile-js-config.xml
@@ -89,7 +89,6 @@
</include-sources>
<include-classes>
- <class>Ace</class>
</include-classes>
<include-namespaces>
diff --git a/frameworks/projects/Ace/build.xml
b/frameworks/projects/Ace/build.xml
index a5ec831..8dcf8f9 100644
--- a/frameworks/projects/Ace/build.xml
+++ b/frameworks/projects/Ace/build.xml
@@ -29,7 +29,7 @@
<property name="target.name" value="${ant.project.name}.swc" />
- <target name="main"
depends="clean,check-compiler,compile,compile-js,copy-swc,test"
description="Full build of ${ant.project.name}.swc">
+ <target name="main" depends="clean,check-compiler,compile,compile-js,test"
description="Full build of ${ant.project.name}.swc">
</target>
<target name="compile-js">
@@ -87,6 +87,7 @@
<arg value="+royalelib=${ROYALE_HOME}/frameworks" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
+ <arg
value="-external-library-path+=${basedir}/../../../js/libs/ace-1.2.3.swc" />
<arg value="-compiler.strict-xml=true" />
<arg value="-compiler.targets=JSRoyale" />
<arg value="-output=${basedir}/target/${target.name}" />
--
To stop receiving notification emails like this one, please contact
[email protected].
