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 2020/03/08 07:08:51 UTC
[royale-asjs] branch develop updated (4033370 -> fb618bf)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 4033370 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
new dd9b607 implement binding in these controls as rendererers
new fb618bf outerDocument emulation
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../MXRoyale/src/main/resources/defaults.css | 2 +-
.../MXRoyale/src/main/royale/MXRoyaleClasses.as | 1 +
.../MXRoyale/src/main/royale/mx/controls/Label.as | 16 +++++++--
.../AdvancedDataGridItemRendererInitializer.as | 3 +-
...dDataGridSelectableItemRendererClassFactory.as} | 40 +++++++++-------------
.../MXAdvancedDataGridItemRenderer.as | 16 +++++++++
6 files changed, 48 insertions(+), 30 deletions(-)
copy frameworks/projects/{Basic/src/main/royale/org/apache/royale/html/Table.as => MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSelectableItemRendererClassFactory.as} (62%)
[royale-asjs] 01/02: implement binding in these controls as
rendererers
Posted by ah...@apache.org.
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
commit dd9b607596740dfdef4e1cc7ee80dd91e035f682
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sat Mar 7 23:07:32 2020 -0800
implement binding in these controls as rendererers
---
.../MXRoyale/src/main/royale/mx/controls/Label.as | 16 +++++++++++++---
.../MXAdvancedDataGridItemRenderer.as | 16 ++++++++++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
index 83c5107..c66eaa4 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
@@ -49,6 +49,8 @@ COMPILE::JS
import org.apache.royale.core.WrappedHTMLElement;
}
import org.apache.royale.core.ITextModel;
+import org.apache.royale.events.Event;
+import org.apache.royale.binding.ItemRendererDataBinding;
//--------------------------------------
// Events
@@ -283,6 +285,8 @@ public class Label extends UIComponent
typeNames = "Label";
}
+ private var textSet:Boolean;
+
//----------------------------------
// enabled
//----------------------------------
@@ -419,6 +423,10 @@ public class Label extends UIComponent
{
var newText:*;
+ _data = value;
+ addBead(new ItemRendererDataBinding());
+ dispatchEvent(new Event("initBindings"));
+
if (_listData)
{
newText = (_listData as BaseListData).label;
@@ -431,12 +439,12 @@ public class Label extends UIComponent
newText = _data.toString();
}
- if (newText !== undefined/* && !textSet*/)
+ if (newText !== undefined && !textSet)
{
text = newText;
- /*textSet = false;*/
+ textSet = false;
}
-
+
dispatchEvent(new FlexEvent(FlexEvent.DATA_CHANGE));
}
@@ -734,6 +742,8 @@ public class Label extends UIComponent
}
}
+ textSet = true;
+
invalidateSize();
}
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/controls/advancedDataGridClasses/MXAdvancedDataGridItemRenderer.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/controls/advancedDataGridClasses/MXAdvancedDataGridItemRenderer.as
index d0199aa..0066e4f 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/controls/advancedDataGridClasses/MXAdvancedDataGridItemRenderer.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/controls/advancedDataGridClasses/MXAdvancedDataGridItemRenderer.as
@@ -34,6 +34,10 @@ import spark.components.supportClasses.ItemRenderer;
use namespace mx_internal;
+import org.apache.royale.binding.ItemRendererDataBinding;
+import org.apache.royale.events.Event;
+
+
/**
* The MXAdvancedDataGridItemRenderer class defines the Spark item renderer class
* for use with the MX AdvancedDataGrid control.
@@ -78,6 +82,8 @@ public class MXAdvancedDataGridItemRenderer extends ItemRenderer implements ILis
{
super();
// focusEnabled = false;
+ addBead(new ItemRendererDataBinding());
+ dispatchEvent(new Event("initBindings"));
}
//----------------------------------
@@ -120,6 +126,16 @@ public class MXAdvancedDataGridItemRenderer extends ItemRenderer implements ILis
invalidateProperties();
}
+ /**
+ * @private
+ */
+ override public function set data(value:Object):void
+ {
+ addBead(new ItemRendererDataBinding());
+ super.data = value;
+ dispatchEvent(new Event("initBindings"));
+ }
+
//----------------------------------
// editor
//----------------------------------
[royale-asjs] 02/02: outerDocument emulation
Posted by ah...@apache.org.
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
commit fb618bfbad0f2f04c6151e2967ed2c6039f6b6b2
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sat Mar 7 23:07:47 2020 -0800
outerDocument emulation
---
.../MXRoyale/src/main/resources/defaults.css | 2 +-
.../MXRoyale/src/main/royale/MXRoyaleClasses.as | 1 +
.../AdvancedDataGridItemRendererInitializer.as | 3 +-
...edDataGridSelectableItemRendererClassFactory.as | 55 ++++++++++++++++++++++
4 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/resources/defaults.css b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
index e5d8117..3abd24c 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/defaults.css
+++ b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
@@ -120,7 +120,7 @@ adg|AdvancedDataGridColumnList {
IBeadView: ClassReference("mx.containers.beads.AdvancedDataGridListVirtualListView");
IBeadController: ClassReference("mx.controls.advancedDataGridClasses.AdvancedDataGridSingleSelectionMouseController");
IBeadLayout: ClassReference("mx.controls.beads.layouts.AdvancedDataGridVirtualListVerticalLayout");
- IItemRendererClassFactory: ClassReference("org.apache.royale.core.SelectableItemRendererClassFactory");
+ IItemRendererClassFactory: ClassReference("mx.controls.beads.AdvancedDataGridSelectableItemRendererClassFactory");
IItemRenderer: ClassReference("mx.controls.advancedDataGridClasses.AdvancedDataGridItemRenderer");
IItemRendererInitializer: ClassReference("mx.controls.beads.AdvancedDataGridItemRendererInitializer");
ISelectableItemRenderer: ClassReference("mx.controls.advancedDataGridClasses.AdvancedDataGridSelectableItemRendererBead");
diff --git a/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
index 574262e..f100ec2 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
@@ -248,6 +248,7 @@ internal class MXRoyaleClasses
import mx.controls.beads.ListItemRendererInitializer; ListItemRendererInitializer;
import mx.controls.beads.TreeItemRendererInitializer; TreeItemRendererInitializer;
import mx.controls.beads.AdvancedDataGridItemRendererInitializer; AdvancedDataGridItemRendererInitializer;
+ import mx.controls.beads.AdvancedDataGridSelectableItemRendererClassFactory; AdvancedDataGridSelectableItemRendererClassFactory;
import mx.containers.PanelTitleBar; PanelTitleBar;
import mx.containers.beads.PanelView; PanelView;
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridItemRendererInitializer.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridItemRendererInitializer.as
index 748f1d9..b5026ca 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridItemRendererInitializer.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridItemRendererInitializer.as
@@ -96,8 +96,7 @@ package mx.controls.beads
(ir as IListDataItemRenderer).listData = treeListData;
if (firstColumn && adgColumnList.adg.groupLabelField)
- (ir as ILabelFieldItemRenderer).labelField = adgColumnList.adg.groupLabelField;
-
+ (ir as ILabelFieldItemRenderer).labelField = adgColumnList.adg.groupLabelField;
}
override protected function setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSelectableItemRendererClassFactory.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSelectableItemRendererClassFactory.as
new file mode 100644
index 0000000..68ebe5b
--- /dev/null
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSelectableItemRendererClassFactory.as
@@ -0,0 +1,55 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package mx.controls.beads
+{
+ import org.apache.royale.core.IItemRenderer;
+ import org.apache.royale.core.SelectableItemRendererClassFactory;
+ import mx.controls.advancedDataGridClasses.AdvancedDataGridColumnList;
+
+ /**
+ * The AdvancedDataGridItemRendererInitializer class initializes item renderers
+ * in tree classes.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public class AdvancedDataGridSelectableItemRendererClassFactory extends SelectableItemRendererClassFactory
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public function AdvancedDataGridSelectableItemRendererClassFactory()
+ {
+ }
+
+ override public function createItemRenderer():IItemRenderer
+ {
+ var ir:IItemRenderer = super.createItemRenderer();
+ ir["outerDocument"] = (_strand as AdvancedDataGridColumnList).adg.mxmlDocument;
+ return ir;
+ }
+ }
+}