You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by yi...@apache.org on 2016/11/20 07:55:21 UTC
git commit: [flex-asjs] [refs/heads/develop] - Make sure beads are
added to list when defaults are created.
Repository: flex-asjs
Updated Branches:
refs/heads/develop d2ed1ea99 -> c0ac72a80
Make sure beads are added to list when defaults are created.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c0ac72a8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c0ac72a8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c0ac72a8
Branch: refs/heads/develop
Commit: c0ac72a80fc368423481307596a339ab29c83c4e
Parents: d2ed1ea
Author: yishayw <yi...@hotmail.com>
Authored: Sun Nov 20 09:55:08 2016 +0200
Committer: yishayw <yi...@hotmail.com>
Committed: Sun Nov 20 09:55:08 2016 +0200
----------------------------------------------------------------------
.../HTML/src/main/flex/org/apache/flex/html/Accordion.as | 8 ++++----
.../main/flex/org/apache/flex/html/beads/AccordionView.as | 7 +++++--
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0ac72a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Accordion.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Accordion.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Accordion.as
index 3076d0c..4c376ea 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Accordion.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Accordion.as
@@ -73,10 +73,10 @@ package org.apache.flex.html
}
}
}
- }
- if (_collapseBead)
- {
- addBead(_collapseBead);
+ if (_collapseBead)
+ {
+ addBead(_collapseBead);
+ }
}
return _collapseBead;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0ac72a8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/AccordionView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/AccordionView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/AccordionView.as
index 6cc9222..0f733ac 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/AccordionView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/AccordionView.as
@@ -24,7 +24,7 @@ package org.apache.flex.html.beads
import org.apache.flex.events.Event;
import org.apache.flex.html.beads.layouts.IOneFlexibleChildLayout;
import org.apache.flex.html.supportClasses.ICollapsible;
-
+
public class AccordionView extends ListView
{
private var _layout:IOneFlexibleChildLayout;
@@ -49,9 +49,12 @@ package org.apache.flex.html.beads
var c:Class = ValuesManager.valuesImpl.getValue(host, "iBeadLayout");
if (c) {
_layout = new c() as IOneFlexibleChildLayout;
- _strand.addBead(_layout);
}
}
+ if (_layout)
+ {
+ _strand.addBead(_layout);
+ }
}
return _layout;
}