flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [2/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-25906 only reset text when there's an existing data provider
Date Thu, 12 Sep 2013 05:06:34 GMT
FLEX-25906 only reset text when there's an existing data provider


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

Branch: refs/heads/develop
Commit: 17cf4ace2562a03ee8fc677d5cf8b4c796b661ce
Parents: 5b08705
Author: Justin Mclean <jmclean@apache.org>
Authored: Thu Sep 12 15:06:15 2013 +1000
Committer: Justin Mclean <jmclean@apache.org>
Committed: Thu Sep 12 15:06:15 2013 +1000

----------------------------------------------------------------------
 frameworks/projects/spark/src/spark/components/ComboBox.as | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/17cf4ace/frameworks/projects/spark/src/spark/components/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/ComboBox.as b/frameworks/projects/spark/src/spark/components/ComboBox.as
index d7ab5c7..e2ae977 100644
--- a/frameworks/projects/spark/src/spark/components/ComboBox.as
+++ b/frameworks/projects/spark/src/spark/components/ComboBox.as
@@ -344,7 +344,8 @@ public class ComboBox extends DropDownListBase implements IIMESupport
 		if (dataProvider === value)
 			return;
 		
-		selectedItem = null;
+		if (dataProvider != null)
+			selectedItem = null;
 		super.dataProvider = value;
 	}
 


Mime
View raw message