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 2017/03/01 21:09:55 UTC
[07/10] git commit: [flex-asjs] [refs/heads/dual] - dual mode found
lots of interesting stuff
dual mode found lots of interesting stuff
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/abcc8ff8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/abcc8ff8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/abcc8ff8
Branch: refs/heads/dual
Commit: abcc8ff8e78448b0b7787f868417484f68d0e4d5
Parents: 577a2d8
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 13:08:14 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 13:08:14 2017 -0800
----------------------------------------------------------------------
.../flex/org/apache/flex/core/Application.as | 1 +
.../main/flex/org/apache/flex/html/CheckBox.as | 15 ++++++
.../flex/org/apache/flex/html/RadioButton.as | 2 +
.../projects/Basic/src/test/flex/build.xml | 3 +-
.../org/apache/flex/events/EventDispatcher.as | 5 ++
.../main/flex/org/apache/flex/utils/Timer.as | 5 ++
.../org/apache/flex/createjs/Application.as | 51 ++++++++++++++++++++
.../main/flex/org/apache/flex/flat/CheckBox.as | 14 ++++++
.../flex/org/apache/flex/flat/DropDownList.as | 14 ++++++
.../flex/org/apache/flex/flat/RadioButton.as | 14 ++++++
.../flex/org/apache/flex/mdl/RadioButton.as | 20 ++++++++
.../flex/org/apache/flex/mobile/TitleView.as | 7 ---
.../org/apache/flex/mobile/ViewManagerBase.as | 12 +----
13 files changed, 144 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
index 1c7cb0f..a7be814 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
@@ -89,6 +89,7 @@ package org.apache.flex.core
* @productversion FlexJS 0.0
*/
[Event(name="applicationComplete", type="org.apache.flex.events.Event")]
+
/**
* The Application class is the main class and entry point for a FlexJS
* application. This Application class is different than the
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/CheckBox.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/CheckBox.as
index 89ea4cd..5b8e0a5 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/CheckBox.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/CheckBox.as
@@ -131,6 +131,20 @@ package org.apache.flex.html
}
}
+ //--------------------------------------
+ // Events
+ //--------------------------------------
+
+ /**
+ * Dispatched when the user checks or un-checks the CheckBox.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="change", type="org.apache.flex.events.Event")]
+
COMPILE::JS
public class CheckBox extends UIBase
{
@@ -174,6 +188,7 @@ package org.apache.flex.html
_label.childNodes.item(1).nodeValue = value;
}
+ [Bindable("change")]
public function get selected():Boolean
{
return (_icon.element as HTMLInputElement).checked;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/RadioButton.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/RadioButton.as
index 9aa2254..282a9b7 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/RadioButton.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/RadioButton.as
@@ -221,6 +221,8 @@ package org.apache.flex.html
}
}
+ [Event(name="change", type="org.apache.flex.events.Event")]
+
COMPILE::JS
public class RadioButton extends UIBase
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/Basic/src/test/flex/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/test/flex/build.xml b/frameworks/projects/Basic/src/test/flex/build.xml
index 97f973e..bbdc0da 100644
--- a/frameworks/projects/Basic/src/test/flex/build.xml
+++ b/frameworks/projects/Basic/src/test/flex/build.xml
@@ -88,7 +88,7 @@
</target>
<path id="lib.path">
- <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
+ <fileset dir="${FALCONJX_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
<target name="compile" description="Compiles FlexUnitApplication.swf">
@@ -119,6 +119,7 @@
<jvmarg line="${mxmlc.jvm.args}"/>
<arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
<arg value="-debug" />
+ <arg value="-compiler.targets=SWF" />
<arg value="-compiler.mxml.children-as-data" />
<arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent" />
<arg value="-compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/Core/src/main/flex/org/apache/flex/events/EventDispatcher.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/EventDispatcher.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/EventDispatcher.as
index 0d2b081..cb8040a 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/EventDispatcher.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/EventDispatcher.as
@@ -99,5 +99,10 @@ package org.apache.flex.events
}
return false;
}
+
+ public function toString():String
+ {
+ return "EventDispatcher";
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Timer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Timer.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Timer.as
index f16efb4..a0259f9 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Timer.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Timer.as
@@ -129,6 +129,11 @@ public class Timer extends EventDispatcher
public var delay:Number;
public var repeatCount:int;
+ public function running():Boolean
+ {
+ return timerInterval != -1;
+ }
+
private var _currentCount:int = 0;
public function get currentCount():int
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as
index ac22fa0..d778020 100644
--- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as
+++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as
@@ -90,6 +90,7 @@ package org.apache.flex.createjs
* @productversion FlexJS 0.0
*/
[Event(name="applicationComplete", type="org.apache.flex.events.Event")]
+
/**
* The Application class is the main class and entry point for a FlexJS
* application. This Application class is different than the
@@ -116,6 +117,56 @@ package org.apache.flex.createjs
// does nothing different for SWF side
}
+ /**
+ * Dispatched at startup. Attributes and sub-instances of
+ * the MXML document have been created and assigned.
+ * The component lifecycle is different
+ * than the Flex SDK. There is no creationComplete event.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="initialize", type="org.apache.flex.events.Event")]
+
+ /**
+ * Dispatched at startup before the instances get created.
+ * Beads can call preventDefault and defer initialization.
+ * This event will be dispatched on every frame until no
+ * listeners call preventDefault(), then the initialize()
+ * method will be called.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="preinitialize", type="org.apache.flex.events.Event")]
+
+ /**
+ * Dispatched at startup after the initial view has been
+ * put on the display list. This event is sent before
+ * applicationComplete is dispatched.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="viewChanged", type="org.apache.flex.events.Event")]
+
+ /**
+ * Dispatched at startup after the initial view has been
+ * put on the display list.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="applicationComplete", type="org.apache.flex.events.Event")]
+
COMPILE::JS
public class Application extends ApplicationBase implements IStrand, IParent, IEventDispatcher
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as
index 2d09772..497ea48 100644
--- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as
+++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as
@@ -55,6 +55,20 @@ package org.apache.flex.flat
}
}
+ //--------------------------------------
+ // Events
+ //--------------------------------------
+
+ /**
+ * Dispatched when the user checks or un-checks the CheckBox.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="change", type="org.apache.flex.events.Event")]
+
COMPILE::JS
public class CheckBox extends UIBase
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as
index 1e4b3c7..b1c6a9e 100644
--- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as
+++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as
@@ -61,6 +61,20 @@ package org.apache.flex.flat
}
}
+ //--------------------------------------
+ // Events
+ //--------------------------------------
+
+ /**
+ * Dispatched when the user selects an item.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="change", type="org.apache.flex.events.Event")]
+
COMPILE::JS
public class DropDownList extends ListBase
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/RadioButton.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/RadioButton.as
index 9fe9d1b..e4bb322 100644
--- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/RadioButton.as
+++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/RadioButton.as
@@ -54,6 +54,20 @@ package org.apache.flex.flat
}
}
+ //--------------------------------------
+ // Events
+ //--------------------------------------
+
+ /**
+ * Dispatched when the user selects a RadioButton.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="change", type="org.apache.flex.events.Event")]
+
COMPILE::JS
public class RadioButton extends UIBase
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as
index 4eb24de..6cee249 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as
@@ -256,6 +256,26 @@ package org.apache.flex.mdl
}
}
+ /**
+ * Dispatched when the user clicks on RadioButton.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ [Event(name="click", type="org.apache.flex.events.MouseEvent")]
+
+ /**
+ * Dispatched when RadioButton is being selected/unselected.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ [Event(name="change", type="org.apache.flex.events.Event")]
+
COMPILE::JS
public class RadioButton extends UIBase
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TitleView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TitleView.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TitleView.as
index 2b7f43f..b37bcfd 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TitleView.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/TitleView.as
@@ -49,18 +49,11 @@ package org.apache.flex.mobile
_title = value;
}
- COMPILE::SWF
override public function toString():String
{
return _title;
}
- COMPILE::JS
- public function toString():String
- {
- return _title;
- }
-
private var _viewManager:IViewManager;
public function get viewManager():IViewManager
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/abcc8ff8/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
index 6d7175e..7c44e07 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/ViewManagerBase.as
@@ -83,21 +83,11 @@ package org.apache.flex.mobile
ViewManagerModel(model).title = value;
}
- COMPILE::SWF
override public function toString():String
{
return ViewManagerModel(model).title;
}
-
- /**
- * @private
- */
- COMPILE::JS
- public function toString():String
- {
- return ViewManagerModel(model).title;
- }
-
+
/**
* True if this view manager instance is displaying a NavigationBar.
*