You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2017/01/10 08:29:00 UTC
[1/2] git commit: [flex-sdk] [refs/heads/release4.16.0] - Fix
regression issue. Turns out LabelUtil.itemToLabel has side effects and text
was not updated on control unless called
Repository: flex-sdk
Updated Branches:
refs/heads/release4.16.0 442b844e1 -> db8c1bf7c
Fix regression issue. Turns out LabelUtil.itemToLabel has side effects and text was not updated on control unless called
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/45239746
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/45239746
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/45239746
Branch: refs/heads/release4.16.0
Commit: 4523974603953af1e042917f0098049dd290ffb2
Parents: d7fdb19
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jan 10 19:28:19 2017 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jan 10 19:28:19 2017 +1100
----------------------------------------------------------------------
.../projects/spark/src/spark/components/DropDownList.as | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/45239746/frameworks/projects/spark/src/spark/components/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/DropDownList.as b/frameworks/projects/spark/src/spark/components/DropDownList.as
index e4dbd96..b6dfa01 100644
--- a/frameworks/projects/spark/src/spark/components/DropDownList.as
+++ b/frameworks/projects/spark/src/spark/components/DropDownList.as
@@ -367,11 +367,13 @@ public class DropDownList extends DropDownListBase
{
if (labelDisplay)
{
- if (displayItem == undefined)
- displayItem = selectedItem;
- else
- labelDisplay.text = displayItem != null ? LabelUtil.itemToLabel(displayItem, labelField, labelFunction) : prompt;
- }
+ if (displayItem == undefined)
+ displayItem = selectedItem;
+ if (displayItem != null && displayItem != undefined)
+ labelDisplay.text = LabelUtil.itemToLabel(displayItem, labelField, labelFunction);
+ else
+ labelDisplay.text = prompt;
+ }
}
}
}
\ No newline at end of file
[2/2] git commit: [flex-sdk] [refs/heads/release4.16.0] - Merge
branch 'release4.16.0' of https://git-wip-us.apache.org/repos/asf/flex-sdk
into release4.16.0
Posted by jm...@apache.org.
Merge branch 'release4.16.0' of https://git-wip-us.apache.org/repos/asf/flex-sdk into release4.16.0
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/db8c1bf7
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/db8c1bf7
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/db8c1bf7
Branch: refs/heads/release4.16.0
Commit: db8c1bf7cc39eb77f9fcf0042a41f658e0867cd2
Parents: 4523974 442b844
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jan 10 19:28:38 2017 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Jan 10 19:28:38 2017 +1100
----------------------------------------------------------------------
ApproveSDK.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------