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 2015/10/08 21:25:44 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - Set
itemRenderers to full width of the "column" and leave height alone;
grid lines will have to be achieved through other means, such as beads.
Repository: flex-asjs
Updated Branches:
refs/heads/develop 848f245db -> 258e69239
Set itemRenderers to full width of the "column" and leave height alone; grid lines will have to be achieved through other means, such as beads.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/29970783
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/29970783
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/29970783
Branch: refs/heads/develop
Commit: 29970783852014e5a17f1f609c008009108bede5
Parents: 848f245
Author: Peter Ent <pe...@apache.org>
Authored: Thu Oct 8 15:25:12 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Oct 8 15:25:12 2015 -0400
----------------------------------------------------------------------
.../src/org/apache/flex/core/ItemRendererClassFactory.as | 1 -
.../src/org/apache/flex/core/ItemRendererClassFactory.js | 1 -
frameworks/projects/HTML/as/defaults.css | 4 +---
.../HTML/as/src/org/apache/flex/html/beads/ListView.as | 1 -
.../asjs/src/org/apache/flex/html/beads/DataGridView.as | 10 +++++-----
.../html/beads/DataItemRendererFactoryForArrayList.as | 7 +++++--
6 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/29970783/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
index b2a7ef3..b3875e7 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
@@ -175,7 +175,6 @@ package org.apache.flex.core
{
var renderer:IItemRenderer = itemRendererFactory.newInstance();
renderer.itemRendererParent = parent;
- parent.addElement(renderer);
return renderer;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/29970783/frameworks/projects/Core/js/src/org/apache/flex/core/ItemRendererClassFactory.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/js/src/org/apache/flex/core/ItemRendererClassFactory.js b/frameworks/projects/Core/js/src/org/apache/flex/core/ItemRendererClassFactory.js
index a5f8c5f..9d3ca0d 100644
--- a/frameworks/projects/Core/js/src/org/apache/flex/core/ItemRendererClassFactory.js
+++ b/frameworks/projects/Core/js/src/org/apache/flex/core/ItemRendererClassFactory.js
@@ -92,6 +92,5 @@ org.apache.flex.core.ItemRendererClassFactory.
org.apache.flex.core.ItemRendererClassFactory.
prototype.createFromClass = function(parent) {
var renderer = this.itemRendererClassFactory.newInstance();
- parent.addElement(renderer);
return renderer;
};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/29970783/frameworks/projects/HTML/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/defaults.css b/frameworks/projects/HTML/as/defaults.css
index 1a61438..db0145c 100644
--- a/frameworks/projects/HTML/as/defaults.css
+++ b/frameworks/projects/HTML/as/defaults.css
@@ -104,8 +104,6 @@ DataGrid
IDataGridPresentationModel: ClassReference("org.apache.flex.html.beads.models.DataGridPresentationModel");
IBeadView: ClassReference("org.apache.flex.html.beads.DataGridView");
IBeadModel: ClassReference("org.apache.flex.html.beads.models.DataGridModel");
- IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
- IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
background-color: #FFFFFF;
border-style: solid;
@@ -129,7 +127,7 @@ DataGrid
}
.DataGridListArea {
- background-color: #AAAAAA;
+ background-color: #FFFFFF;
border-style: solid;
border-color: #333333;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/29970783/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
index a9192f4..a38afec 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
@@ -205,7 +205,6 @@ package org.apache.flex.html.beads
override protected function resizeHandler(event:Event):void
{
super.resizeHandler(event);
- dataGroup.updateAllItemRenderers();
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/29970783/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
index 43c410f..7f220e9 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
@@ -188,10 +188,10 @@ package org.apache.flex.html.beads
var dataGridColumn:DataGridColumn = sharedModel.columns[i] as DataGridColumn;
var colWidth:Number = dataGridColumn.columnWidth;
- if (!isNaN(colWidth)) list.width = colWidth - 1;
- else list.width = listWidth - 1;
+ if (!isNaN(colWidth)) list.width = colWidth;
+ else list.width = listWidth;
- xpos += list.width + 1;
+ xpos += list.width;
}
}
}
@@ -293,8 +293,8 @@ package org.apache.flex.html.beads
list.addBead(presentationModel);
var colWidth:Number = dataGridColumn.columnWidth;
- if (!isNaN(colWidth)) list.width = colWidth - 1;
- else list.width = listWidth - 1;
+ if (!isNaN(colWidth)) list.width = colWidth;
+ else list.width = listWidth;
_listArea.addElement(list);
_lists.push(list);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/29970783/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
index f2c4ae7..9895394 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
@@ -156,10 +156,13 @@ package org.apache.flex.html.beads
ir.index = i;
ir.labelField = labelField;
if (presentationModel) {
+ UIBase(ir).height = presentationModel.rowHeight;
+
+ // ensure that the IR spans the width of its column
var style:SimpleCSSStyles = new SimpleCSSStyles();
- style.marginBottom = presentationModel.separatorThickness;
+ style.right = 0;
+ style.left = 0;
UIBase(ir).style = style;
- UIBase(ir).height = presentationModel.rowHeight;
}
dataGroup.addElement(ir);
ir.data = dp.getItemAt(i);
[2/2] git commit: [flex-asjs] [refs/heads/develop] - MobileTrader
example now fully operational.
Posted by pe...@apache.org.
MobileTrader example now fully operational.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/258e6923
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/258e6923
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/258e6923
Branch: refs/heads/develop
Commit: 258e69239b4d4a839c047e05c14903b1e5e80101
Parents: 2997078
Author: Peter Ent <pe...@apache.org>
Authored: Thu Oct 8 15:25:40 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Oct 8 15:25:40 2015 -0400
----------------------------------------------------------------------
.../flexjs/MobileTrader/src/controller/AlertsViewController.as | 1 +
examples/flexjs/MobileTrader/src/models/ProductsModel.as | 3 ++-
examples/flexjs/MobileTrader/src/views/AlertsView.mxml | 2 +-
examples/flexjs/MobileTrader/src/views/WatchListView.mxml | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/258e6923/examples/flexjs/MobileTrader/src/controller/AlertsViewController.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/controller/AlertsViewController.as b/examples/flexjs/MobileTrader/src/controller/AlertsViewController.as
index 254cd18..f8373ca 100644
--- a/examples/flexjs/MobileTrader/src/controller/AlertsViewController.as
+++ b/examples/flexjs/MobileTrader/src/controller/AlertsViewController.as
@@ -131,6 +131,7 @@ package controller
alert.message = "Now @"+alert.stock.last;
}
}
+ alerts.itemUpdatedAt(i);
}
var newEvent:Event = new Event("alertsUpdate");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/258e6923/examples/flexjs/MobileTrader/src/models/ProductsModel.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/models/ProductsModel.as b/examples/flexjs/MobileTrader/src/models/ProductsModel.as
index b6f91ad..f4b2008 100755
--- a/examples/flexjs/MobileTrader/src/models/ProductsModel.as
+++ b/examples/flexjs/MobileTrader/src/models/ProductsModel.as
@@ -108,7 +108,7 @@ package models
stock = new Stock(symbol);
_watchList.addItem(stock);
- dispatchEvent(new Event("update"));
+ // dispatchEvent(new Event("update"));
updateStockData(stock);
return stock;
@@ -156,6 +156,7 @@ package models
var stock:Stock = _watchList.getItemAt(i) as Stock;
if (stock.symbol == sym) {
stock.updateFromData(responseData);
+ _watchList.itemUpdatedAt(i);
break;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/258e6923/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/views/AlertsView.mxml b/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
index 96c9b86..3bc76bb 100755
--- a/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
+++ b/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
@@ -48,7 +48,6 @@ limitations under the License.
private function onAlertSet():void
{
dispatchEvent(new org.apache.flex.events.Event("alertSet"));
- dataGrid.model.dispatchEvent(new org.apache.flex.events.Event("dataProviderChanged"));
}
]]>
</fx:Script>
@@ -67,6 +66,7 @@ limitations under the License.
<js:DataGrid id="dataGrid" x="0" y="40" width="100%" height="200">
<js:beads>
+ <js:DataProviderChangeNotifier sourceID="dataModel" propertyName="alerts" />
<js:SimpleBinding
eventName="alertsUpdate"
sourceID="dataModel"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/258e6923/examples/flexjs/MobileTrader/src/views/WatchListView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/views/WatchListView.mxml b/examples/flexjs/MobileTrader/src/views/WatchListView.mxml
index ec70e59..46c7434 100755
--- a/examples/flexjs/MobileTrader/src/views/WatchListView.mxml
+++ b/examples/flexjs/MobileTrader/src/views/WatchListView.mxml
@@ -60,7 +60,6 @@ limitations under the License.
private function addSymbol():void
{
dispatchEvent(new org.apache.flex.events.Event("addSymbol"));
- dataGrid.model.dispatchEvent(new org.apache.flex.events.Event("dataProviderChanged"));
}
public var selectedStockIndex:Number;
@@ -103,6 +102,7 @@ limitations under the License.
<js:DataGrid id="dataGrid" width="100%" height="85%" change="selectRow()" className="WatchListDataGrid">
<js:beads>
+ <js:DataProviderChangeNotifier sourceID="dataModel" propertyName="watchList" />
<js:SimpleBinding
eventName="update"
sourceID="dataModel"