You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2019/12/12 05:38:51 UTC
[royale-asjs] branch develop updated: fix MXTests
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 0872220 fix MXTests
0872220 is described below
commit 08722205cf1e157ad593b462d37f5ab54028bff5
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Dec 11 21:38:35 2019 -0800
fix MXTests
---
.../projects/MXRoyale/src/main/resources/defaults.css | 1 +
.../src/main/royale/mx/controls/listClasses/ListBase.as | 16 +++++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/resources/defaults.css b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
index ff1aefb..85b2412 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/defaults.css
+++ b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
@@ -231,6 +231,7 @@ List
IDataProviderItemRendererMapper: ClassReference("mx.controls.listClasses.DataItemRendererFactoryForICollectionViewData");
IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
IItemRenderer: ClassReference("mx.controls.listClasses.ListItemRenderer");
+ IListPresentationModel: ClassReference("org.apache.royale.html.beads.models.ListPresentationModel");
IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport");
IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
index 90e688e..9d37def 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
@@ -26,12 +26,12 @@ import mx.collections.ListCollectionView;
import mx.collections.XMLListCollection;
import mx.core.EdgeMetrics;
import mx.core.IUIComponent;
+import mx.core.ScrollControlBase;
import mx.core.ScrollPolicy;
import mx.core.UIComponent;
import mx.core.mx_internal;
import mx.events.CollectionEvent;
import mx.utils.UIDUtil;
-import mx.core.ScrollControlBase;
import org.apache.royale.core.ContainerBaseStrandChildren;
import org.apache.royale.core.IBead;
@@ -803,10 +803,16 @@ use namespace mx_internal;
public function get presentationModel():IBead
{
if (_presentationModel == null) {
- var c:Class = ValuesManager.valuesImpl.getValue(this, "iListPresentationModel");
- if (c) {
- _presentationModel = new c() as IListPresentationModel;
- addBead(_presentationModel as IBead);
+ var bead:IBead = getBeadByType(IListPresentationModel);
+ if (bead)
+ _presentationModel = bead as IListPresentationModel;
+ else
+ {
+ var c:Class = ValuesManager.valuesImpl.getValue(this, "iListPresentationModel");
+ if (c) {
+ _presentationModel = new c() as IListPresentationModel;
+ addBead(_presentationModel as IBead);
+ }
}
}