You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2017/10/29 23:02:12 UTC
[royale-asjs] branch develop updated: Added rerender
This is an automated email from the ASF dual-hosted git repository.
harbs 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 3b235a7 Added rerender
3b235a7 is described below
commit 3b235a73dd3db9fc9b9d1dc399d9d327200dfb5b
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Oct 30 01:02:09 2017 +0200
Added rerender
---
examples/express/DataGridExample/src/main/royale/MyInitialView.mxml | 3 ++-
.../main/royale/org/apache/royale/html/beads/DataContainerView.as | 4 ++--
.../royale/org/apache/royale/html/beads/DataGridPercentageView.as | 5 ++++-
.../src/main/royale/org/apache/royale/html/beads/DataGridView.as | 5 ++++-
.../apache/royale/html/beads/DataItemRendererFactoryForArrayList.as | 1 +
.../Basic/src/main/royale/org/apache/royale/html/beads/GroupView.as | 2 +-
6 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/examples/express/DataGridExample/src/main/royale/MyInitialView.mxml b/examples/express/DataGridExample/src/main/royale/MyInitialView.mxml
index 06f6232..1f5673a 100644
--- a/examples/express/DataGridExample/src/main/royale/MyInitialView.mxml
+++ b/examples/express/DataGridExample/src/main/royale/MyInitialView.mxml
@@ -71,7 +71,8 @@ limitations under the License.
<js:TextButton text="Set Provider" click="setProvider()"/>
<js:TextButton text="Add to Provider" click="addToProvider()" x="120"/>
- <js:DataGrid id="dataGrid" x="20" y="30" width="400" height="200" change="dataGridChange(dataGrid)" rowHeight="40">
+ <js:DataGrid id="dataGrid" x="20" y="30" width="400" height="200" dragEnabled="true" dropEnabled="true"
+ change="dataGridChange(dataGrid)" rowHeight="40">
<js:beads>
<js:ConstantBinding
sourceID="applicationModel"
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
index 37b1e23..9f11b44 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
@@ -109,7 +109,7 @@ package org.apache.royale.html.beads
*/
protected function itemsCreatedHandler(event:Event):void
{
- trace("DataContainerView: itemsCreatedHandler");
+ // trace("DataContainerView: itemsCreatedHandler");
host.dispatchEvent(new Event("layoutNeeded"));
}
@@ -118,7 +118,7 @@ package org.apache.royale.html.beads
*/
protected function dataProviderChangeHandler(event:Event):void
{
- trace("DataContainerView: dataProviderChangeHandler");
+ // trace("DataContainerView: dataProviderChangeHandler");
performLayout(event);
}
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridPercentageView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridPercentageView.as
index 94d8b07..f87129e 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridPercentageView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridPercentageView.as
@@ -212,7 +212,10 @@ package org.apache.royale.html.beads
{
var list:DataGridColumnList = _lists[i] as DataGridColumnList;
var listModel:ISelectionModel = list.getBeadByType(IBeadModel) as ISelectionModel;
- listModel.dataProvider = sharedModel.dataProvider;
+ if(listModel.dataProvider == sharedModel.dataProvider)
+ listModel.dispatchEvent(new Event("rerender"));
+ else
+ listModel.dataProvider = sharedModel.dataProvider;
}
host.dispatchEvent(new Event("layoutNeeded"));
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
index 57e11a8..bff4b4e 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
@@ -224,7 +224,10 @@ package org.apache.royale.html.beads
{
var list:DataGridColumnList = _lists[i] as DataGridColumnList;
var listModel:ISelectionModel = list.getBeadByType(IBeadModel) as ISelectionModel;
- listModel.dataProvider = sharedModel.dataProvider;
+ if(listModel.dataProvider == sharedModel.dataProvider)
+ listModel.dispatchEvent(new Event("rerender"));
+ else
+ listModel.dataProvider = sharedModel.dataProvider;
}
host.dispatchEvent(new Event("layoutNeeded"));
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as
index 6b58158..3cf9c2f 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as
@@ -96,6 +96,7 @@ package org.apache.royale.html.beads
{
dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
dataProviderModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
+ dataProviderModel.addEventListener("rerender", dataProviderChangeHandler);
labelField = dataProviderModel.labelField;
dataFieldProvider = _strand.getBeadByType(DataFieldProviderBead) as DataFieldProviderBead;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/GroupView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/GroupView.as
index acd452f..9a80d47 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/GroupView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/GroupView.as
@@ -221,7 +221,7 @@ package org.apache.royale.html.beads
*/
protected function performLayout(event:Event):void
{
- trace("CALLING performLayout !!!!");
+ // trace("CALLING performLayout !!!!");
}
/**
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].