You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2017/03/31 16:04:47 UTC
git commit: [flex-asjs] [refs/heads/feature/chart-work] - Lists and
Tree now select.
Repository: flex-asjs
Updated Branches:
refs/heads/feature/chart-work 4f0765d01 -> dbf3bad9e
Lists and Tree now select.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/dbf3bad9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dbf3bad9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dbf3bad9
Branch: refs/heads/feature/chart-work
Commit: dbf3bad9ebec892c477b60392addf3d95b931786
Parents: 4f0765d
Author: Peter Ent <pe...@apache.org>
Authored: Fri Mar 31 12:04:45 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Mar 31 12:04:45 2017 -0400
----------------------------------------------------------------------
.../flex/html/supportClasses/ContainerContentArea.as | 11 ++++++++++-
.../org/apache/flex/html/supportClasses/DataGroup.as | 6 +++---
.../flex/org/apache/flex/html/supportClasses/Viewport.as | 2 ++
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dbf3bad9/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as
index 326739d..53d9bd5 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as
@@ -18,6 +18,8 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.supportClasses
{
+ import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IStrand;
import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
@@ -33,7 +35,7 @@ package org.apache.flex.html.supportClasses
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class ContainerContentArea extends UIBase implements ILayoutView
+ public class ContainerContentArea extends UIBase implements IBead, ILayoutView
{
/**
* Constructor.
@@ -48,6 +50,13 @@ package org.apache.flex.html.supportClasses
super();
addEventListener("layoutNeeded", forwardEventHandler);
}
+
+ protected var host:IStrand;
+
+ public function set strand(value:IStrand):void
+ {
+ host = value;
+ }
private function forwardEventHandler(event:Event):void
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dbf3bad9/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as
index 76fdd3a..b6ebb71 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as
@@ -76,7 +76,7 @@ package org.apache.flex.html.supportClasses
var newEvent:ItemAddedEvent = new ItemAddedEvent("itemAdded");
newEvent.item = renderer;
- dispatchEvent(newEvent);
+ (host as IEventDispatcher).dispatchEvent(newEvent);
}
/**
@@ -95,7 +95,7 @@ package org.apache.flex.html.supportClasses
var newEvent:ItemRemovedEvent = new ItemRemovedEvent("itemRemoved");
newEvent.item = renderer;
- dispatchEvent(newEvent);
+ (host as IEventDispatcher).dispatchEvent(newEvent);
}
/**
@@ -111,7 +111,7 @@ package org.apache.flex.html.supportClasses
{
while (numElements > 0) {
var child:IChild = getElementAt(0);
- removeElement(child);
+ removeItemRenderer(child as IItemRenderer);
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dbf3bad9/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
index f671683..875c4d8 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
@@ -90,6 +90,7 @@ package org.apache.flex.html.supportClasses
{
var c:Class = ValuesManager.valuesImpl.getValue(_strand, 'iContentView') as Class;
contentArea = new c() as UIBase;
+ _strand.addBead(contentArea as IBead);
}
}
@@ -109,6 +110,7 @@ package org.apache.flex.html.supportClasses
var result:Object = new c();
if (result != null) {
contentArea = result as UIBase;
+ _strand.addBead(contentArea as IBead);
}
}
}