flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - ListView, JavaScript version, wasn't taking into account a layout that may already exist and was allow two layouts to exist on the strand.
Date Wed, 17 Sep 2014 20:17:39 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 9999c237a -> d924c8063


ListView, JavaScript version, wasn't taking into account a layout that may already exist and
was allow two layouts to exist on the strand.


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d924c806
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d924c806
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d924c806

Branch: refs/heads/develop
Commit: d924c806319581acdd354d83d7c653a1f01461dd
Parents: 9999c23
Author: Peter Ent <pent@apache.org>
Authored: Wed Sep 17 16:17:34 2014 -0400
Committer: Peter Ent <pent@apache.org>
Committed: Wed Sep 17 16:17:34 2014 -0400

----------------------------------------------------------------------
 frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d924c806/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js
index 5655b84..e3329c5 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js
@@ -76,11 +76,12 @@ org.apache.flex.html.beads.ListView.prototype.set_strand =
   this.dataGroup_.set_strand(this);
   this.strand_.addElement(this.dataGroup_);
 
-  if (this.layout_ == null) {
+  if (this.strand_.getBeadByType(org.apache.flex.core.IBeadLayout) == null) {
     var m3 = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this.strand_, 'iBeadLayout');
     this.layout_ = new m3();
+    this.strand_.addBead(this.layout_);
+    //this.layout_.set_strand(this.strand_);
   }
-  this.layout_.set_strand(this.strand_);
 
   this.handleSizeChange(null);
 };


Mime
View raw message