Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9B6FC11BDF for ; Fri, 13 Jun 2014 22:37:01 +0000 (UTC) Received: (qmail 92115 invoked by uid 500); 13 Jun 2014 22:37:01 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 92087 invoked by uid 500); 13 Jun 2014 22:37:01 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 92081 invoked by uid 99); 13 Jun 2014 22:37:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jun 2014 22:37:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4B3DF9344DE; Fri, 13 Jun 2014 22:37:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bigosmallm@apache.org To: commits@flex.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-sdk] [refs/heads/develop] - Revert "FLEX-34222 fix selection reverting to previous typed values when second value (not in list) is entered" Date: Fri, 13 Jun 2014 22:37:01 +0000 (UTC) Repository: flex-sdk Updated Branches: refs/heads/develop 0f4d0e726 -> 4199d43a3 Revert "FLEX-34222 fix selection reverting to previous typed values when second value (not in list) is entered" This reverts commit 05ea4798b51a03ef94576f17512473296a5d42a1. Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4199d43a Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4199d43a Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4199d43a Branch: refs/heads/develop Commit: 4199d43a3a7e036ac0bd7e20a13a9bb26e94c183 Parents: 0f4d0e7 Author: Om Authored: Fri Jun 13 15:34:25 2014 -0700 Committer: Om Committed: Fri Jun 13 15:34:25 2014 -0700 ---------------------------------------------------------------------- frameworks/projects/spark/src/spark/components/ComboBox.as | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4199d43a/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 9be4b50..6ef3125 100644 --- a/frameworks/projects/spark/src/spark/components/ComboBox.as +++ b/frameworks/projects/spark/src/spark/components/ComboBox.as @@ -672,7 +672,6 @@ public class ComboBox extends DropDownListBase implements IIMESupport } else { - selectedItem = textInput.text; super.changeHighlightedSelection(CUSTOM_SELECTED_ITEM); } } @@ -981,7 +980,7 @@ public class ComboBox extends DropDownListBase implements IIMESupport if (selectedItem != null) textInput.text = itemToLabel(selectedItem); else - textInput.text = ""; + textInput.text = ""; } changeHighlightedSelection(selectedIndex); }