You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/12/16 22:35:01 UTC
[1/3] git commit: [flex-asjs] [refs/heads/core_js_to_as] - fix
buttons when cross-compiled
Repository: flex-asjs
Updated Branches:
refs/heads/core_js_to_as 87fbdb9e9 -> 6a71b8584
fix buttons when cross-compiled
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6a71b858
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6a71b858
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6a71b858
Branch: refs/heads/core_js_to_as
Commit: 6a71b8584a5726549333031e168f80b129291220
Parents: aad8244
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 16 13:34:33 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 16 13:34:49 2015 -0800
----------------------------------------------------------------------
.../projects/JQuery/as/src/org/apache/flex/jquery/RadioButton.as | 3 +++
.../projects/JQuery/as/src/org/apache/flex/jquery/TextButton.as | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a71b858/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/RadioButton.as b/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/RadioButton.as
index 7a9c9e6..cc27ad9 100644
--- a/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/RadioButton.as
+++ b/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/RadioButton.as
@@ -26,6 +26,9 @@ package org.apache.flex.jquery
}
+ /**
+ * @flexjsignorecoercion HTMLInputElement
+ */
COMPILE::JS
public class RadioButton extends org.apache.flex.html.RadioButton
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6a71b858/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/TextButton.as b/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/TextButton.as
index e2c750c..a20ef8e 100644
--- a/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/TextButton.as
+++ b/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/TextButton.as
@@ -31,6 +31,9 @@ package org.apache.flex.jquery
super();
}
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ */
COMPILE::JS
override protected function createElement():WrappedHTMLElement
{
[3/3] git commit: [flex-asjs] [refs/heads/core_js_to_as] - add in
jquery externs swc
Posted by ah...@apache.org.
add in jquery externs swc
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9e7d5b78
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9e7d5b78
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9e7d5b78
Branch: refs/heads/core_js_to_as
Commit: 9e7d5b78c9e2bf9c13171cc233a64daf1a4585d0
Parents: 87fbdb9
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 16 13:33:36 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 16 13:34:49 2015 -0800
----------------------------------------------------------------------
examples/flexjs/FlexJSStore_jquery/build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9e7d5b78/examples/flexjs/FlexJSStore_jquery/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/build.xml b/examples/flexjs/FlexJSStore_jquery/build.xml
index 7dc4d66..4412a04 100644
--- a/examples/flexjs/FlexJSStore_jquery/build.xml
+++ b/examples/flexjs/FlexJSStore_jquery/build.xml
@@ -57,6 +57,8 @@
property="GOOG_HOME"
value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+ <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/jquery/out/bin/jquery-1.9.swc"/>
+
<include file="${basedir}/../../build_example.xml" />
<target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">
[2/3] git commit: [flex-asjs] [refs/heads/core_js_to_as] - move
inject_html
Posted by ah...@apache.org.
move inject_html
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/aad82444
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/aad82444
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/aad82444
Branch: refs/heads/core_js_to_as
Commit: aad824440e4e9267e5d1c64761334f93104c6212
Parents: 9e7d5b7
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 16 13:34:14 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 16 13:34:49 2015 -0800
----------------------------------------------------------------------
.../src/org/apache/flex/jquery/Application.as | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/aad82444/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/Application.as b/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/Application.as
index 6cb9229..0770269 100644
--- a/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/Application.as
+++ b/frameworks/projects/JQuery/as/src/org/apache/flex/jquery/Application.as
@@ -21,20 +21,20 @@ package org.apache.flex.jquery
import org.apache.flex.core.Application;
import org.apache.flex.core.IFlexInfo;
- /*
- FalconJX will inject html into the index.html file. Surround with
- "inject_html" tag as follows:
-
- <inject_html>
- <link rel="stylesheet"
- href="http://code.jquery.com/ui/1.10.2/themes/smoothness/jquery-ui.css" />
- <script src="http://code.jquery.com/jquery-1.9.1.js"></script>
- <script src="http://code.jquery.com/ui/1.10.2/jquery-ui.js"></script>
- </inject_html>
- */
public class Application extends org.apache.flex.core.Application implements IFlexInfo
{
+ /**
+ * FalconJX will inject html into the index.html file. Surround with
+ * "inject_html" tag as follows:
+ *
+ * <inject_html>
+ * <link rel="stylesheet"
+ * href="http://code.jquery.com/ui/1.10.2/themes/smoothness/jquery-ui.css" />
+ * <script src="http://code.jquery.com/jquery-1.9.1.js"></script>
+ * <script src="http://code.jquery.com/ui/1.10.2/jquery-ui.js"></script>
+ * </inject_html>
+ */
public function Application()
{
super();