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 2016/08/11 23:57:11 UTC
[1/3] git commit: [flex-asjs] [refs/heads/refactor-sprite] - get unit
tests to run
Repository: flex-asjs
Updated Branches:
refs/heads/refactor-sprite 79ad5fceb -> 6b2367f82
get unit tests to run
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/65e60c45
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/65e60c45
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/65e60c45
Branch: refs/heads/refactor-sprite
Commit: 65e60c45c97fbecbc7045b3618445fd3e9b4508b
Parents: 79ad5fc
Author: Alex Harui <ah...@apache.org>
Authored: Thu Aug 11 15:54:09 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Aug 11 15:54:09 2016 -0700
----------------------------------------------------------------------
.../projects/Core/src/test/flex/FlexUnitFlexJSApplication.mxml | 3 ++-
.../projects/HTML/src/test/flex/FlexUnitFlexJSApplication.mxml | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65e60c45/frameworks/projects/Core/src/test/flex/FlexUnitFlexJSApplication.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/test/flex/FlexUnitFlexJSApplication.mxml b/frameworks/projects/Core/src/test/flex/FlexUnitFlexJSApplication.mxml
index db99af7..2af0515 100644
--- a/frameworks/projects/Core/src/test/flex/FlexUnitFlexJSApplication.mxml
+++ b/frameworks/projects/Core/src/test/flex/FlexUnitFlexJSApplication.mxml
@@ -41,7 +41,8 @@ limitations under the License.
]]>
</fx:Script>
<js:valuesImpl>
- <js:SimpleValuesImpl />
+ <!-- for such a simple app, we just set values to an empty array so it thinks it doesn't have any values -->
+ <js:SimpleValuesImpl values="[]"/>
</js:valuesImpl>
</js:Application>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65e60c45/frameworks/projects/HTML/src/test/flex/FlexUnitFlexJSApplication.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/test/flex/FlexUnitFlexJSApplication.mxml b/frameworks/projects/HTML/src/test/flex/FlexUnitFlexJSApplication.mxml
index 06ad1d6..2d79f2a 100644
--- a/frameworks/projects/HTML/src/test/flex/FlexUnitFlexJSApplication.mxml
+++ b/frameworks/projects/HTML/src/test/flex/FlexUnitFlexJSApplication.mxml
@@ -40,7 +40,8 @@ limitations under the License.
]]>
</fx:Script>
<js:valuesImpl>
- <js:SimpleValuesImpl />
+ <!-- for such a simple app, we just set values to an empty array so it thinks it doesn't have any values -->
+ <js:SimpleValuesImpl values="[]"/>
</js:valuesImpl>
</js:Application>
[3/3] git commit: [flex-asjs] [refs/heads/refactor-sprite] - fix drop
Posted by ah...@apache.org.
fix drop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6b2367f8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6b2367f8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6b2367f8
Branch: refs/heads/refactor-sprite
Commit: 6b2367f824a9d35ac0ddec899e0e079b8dc236dd
Parents: 3b4c869
Author: Alex Harui <ah...@apache.org>
Authored: Thu Aug 11 16:56:53 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Aug 11 16:56:53 2016 -0700
----------------------------------------------------------------------
.../flex/org/apache/flex/events/DragEvent.as | 27 ++++++++++++++++++--
.../beads/controllers/DropMouseController.as | 5 ++++
2 files changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6b2367f8/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as
index 3e3c353..97a81b6 100644
--- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as
+++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as
@@ -354,7 +354,6 @@ package org.apache.flex.events
/**
*/
- COMPILE::JS
private static function installDragEventMixin():Boolean
{
var o:Object = org.apache.flex.events.ElementEvents.elementEvents;
@@ -367,8 +366,32 @@ package org.apache.flex.events
/**
* Add some other events to listen from the element
*/
- COMPILE::JS
private static var dragEventMixin:Boolean = installDragEventMixin();
+
+ /**
+ * Calling this calls the static initializers
+ */
+ COMPILE::SWF
+ public static function init():void
+ {
+
+ }
+
+ /**
+ * Create a copy/clone of the Event object.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ COMPILE::SWF
+ override public function cloneEvent():IFlexJSEvent
+ {
+ return createDragEvent(type, this);
+ }
+
+
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6b2367f8/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as
index 3165241..e03d049 100644
--- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as
+++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as
@@ -110,6 +110,11 @@ package org.apache.flex.html.beads.controllers
{
_strand = value;
+ COMPILE::SWF
+ {
+ // consider using [Mixin] and requiring MixinManager
+ DragEvent.init();
+ }
IEventDispatcher(_strand).addEventListener(DragEvent.DRAG_MOVE, dragMoveHandler);
}
[2/3] git commit: [flex-asjs] [refs/heads/refactor-sprite] - tolerate
not having a model
Posted by ah...@apache.org.
tolerate not having a model
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3b4c8697
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3b4c8697
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3b4c8697
Branch: refs/heads/refactor-sprite
Commit: 3b4c8697894c00ff0954529286c6d168dbb6c060
Parents: 65e60c4
Author: Alex Harui <ah...@apache.org>
Authored: Thu Aug 11 15:54:24 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Aug 11 15:54:24 2016 -0700
----------------------------------------------------------------------
.../main/flex/org/apache/flex/core/UIHTMLElementWrapper.as | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3b4c8697/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
index c14a43e..77e0b90 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIHTMLElementWrapper.as
@@ -114,8 +114,11 @@ COMPILE::SWF
// addbead will set _model
var m:Class = org.apache.flex.core.ValuesManager.valuesImpl.
getValue(this, 'iBeadModel') as Class;
- var b:IBeadModel = new m() as IBeadModel;
- addBead(b);
+ if (m)
+ {
+ var b:IBeadModel = new m() as IBeadModel;
+ addBead(b);
+ }
}
return _model;
}