Updated Branches: refs/heads/develop ca0e19300 -> ee5f14256
Fix for issue with row height calculation and position for DataGrid list elements. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ee5f1425 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ee5f1425 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ee5f1425 Branch: refs/heads/develop Commit: ee5f1425616ea4f6e9c99194720ebd9ebdf2fdba Parents: ca0e193 Author: Peter Ent <[email protected]> Authored: Tue Jan 21 16:59:44 2014 -0500 Committer: Peter Ent <[email protected]> Committed: Tue Jan 21 16:59:44 2014 -0500 ---------------------------------------------------------------------- .../flex/html/staticControls/beads/DataGridView.js | 2 +- .../beads/DataItemRendererFactoryForArrayData.js | 1 - .../beads/layouts/NonVirtualVerticalScrollingLayout.js | 11 ++++++++--- .../staticControls/supportClasses/NonVirtualDataGroup.js | 2 ++ .../staticControls/supportClasses/UIItemRendererBase.js | 1 - 5 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ee5f1425/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataGridView.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataGridView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataGridView.js index 5c75078..f384cbb 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataGridView.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataGridView.js @@ -122,7 +122,7 @@ org.apache.flex.html.staticControls.beads.DataGridView.prototype.set_strand = list.addBead(listModel); list.set_itemRenderer(dataGridColumn.get_itemRenderer()); list.set_labelField(dataGridColumn.get_dataField()); - list.set_width(dataGridColumn.get_columnWidth()-2); + list.set_width(dataGridColumn.get_columnWidth() - 2); list.set_height(columnHeight); this.columnContainer.addElement(list); this.columns.push(list); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ee5f1425/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js index a7b64f6..fdd363f 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js @@ -126,7 +126,6 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData. ir.set_index(i); ir.set_labelField(this.model.get_labelField()); ir.set_data(dp[i]); - this.dataGroup.addElement(ir); } var newEvent = new org.apache.flex.events.Event('itemsCreated'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ee5f1425/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js index f9a972d..87073c3 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js @@ -51,6 +51,8 @@ org.apache.flex.html.staticControls.beads.layouts. this.strand_ = value; this.strand_.addEventListener('childrenAdded', goog.bind(this.changeHandler, this)); + this.strand_.addEventListener('layoutNeeded', + goog.bind(this.changeHandler, this)); } }; @@ -65,11 +67,14 @@ org.apache.flex.html.staticControls.beads.layouts. children = this.strand_.internalChildren(); n = children.length; + for (i = 0; i < n; i++) { - if (children[i].style.display == 'none') + if (children[i].element.style.display == 'none') children[i].lastDisplay_ = 'block'; - else - children[i].style.display = 'block'; + else { + children[i].element.style.display = 'inline-block'; + children[i].set_width(this.strand_.get_width()); + } } }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ee5f1425/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js index 45fa447..d7b9f17 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js @@ -59,6 +59,8 @@ org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup. prototype.createElement = function() { this.element = document.createElement('div'); this.element.style.overflow = 'auto'; + this.element.style.display = 'inline-block'; + this.element.style.position = 'inherit'; this.set_className('NonVirtualDataGroup'); return this.element; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ee5f1425/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.js index 47d1579..8651da0 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.js @@ -28,7 +28,6 @@ goog.require('org.apache.flex.events.Event'); */ org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase = function() { - this.renderers = new Array(); goog.base(this); }; goog.inherits(
