FLEX-34390 - added null check on skin.currentState Signed-off-by: Erik de Bruin <e...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/89d9d74b Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/89d9d74b Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/89d9d74b Branch: refs/heads/iso7skins Commit: 89d9d74b9b6270edd208af60ec9095a9b763ebd6 Parents: 3e7a1b4 Author: Erik de Bruin <e...@ixsoftware.nl> Authored: Thu Oct 9 12:19:51 2014 +0200 Committer: Erik de Bruin <e...@ixsoftware.nl> Committed: Thu Oct 9 12:19:51 2014 +0200 ---------------------------------------------------------------------- .../spark/src/spark/components/supportClasses/SkinnableTextBase.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89d9d74b/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableTextBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableTextBase.as b/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableTextBase.as index dfd88cc..f0f768c 100644 --- a/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableTextBase.as +++ b/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableTextBase.as @@ -2699,7 +2699,7 @@ public class SkinnableTextBase extends SkinnableComponent // We may have gone from empty to non-empty or vice-versa. This should // cause the prompt to show or hide. - if (prompt != null && prompt != "" && skin && + if (prompt != null && prompt != "" && skin && skin.currentState && (skin.currentState.indexOf("WithPrompt") != -1 && text.length != 0 || skin.currentState.indexOf("WithPrompt") == -1 && text.length == 0)) invalidateSkinState();