From 4d597069cf1ad55f69478d797d08357f7fa0ef0f Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Mon, 3 Oct 2011 17:08:21 +0200 Subject: [PATCH 1/2] fix problem in CPTokenField with wrong theme state if containing tokens --- AppKit/CPTokenField.j | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/AppKit/CPTokenField.j b/AppKit/CPTokenField.j index 84ee318da..62a5b9912 100755 --- a/AppKit/CPTokenField.j +++ b/AppKit/CPTokenField.j @@ -310,6 +310,15 @@ var CPThemeStateAutoCompleting = @"CPThemeStateAutoCompleting", [self _controlTextDidChange]; } +- (void)_updatePlaceholderState +{ + var objectValue = [self objectValue]; + if ((!objectValue || [objectValue count] === 0) && ![self hasThemeState:CPThemeStateEditing]) + [self setThemeState:CPTextFieldStatePlaceholder]; + else + [self unsetThemeState:CPTextFieldStatePlaceholder]; +} + // ============= // = RESPONDER = // ============= From b424c19eee18595cabac58e467b2595bf22ad495 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Mon, 3 Oct 2011 17:28:32 +0200 Subject: [PATCH 2/2] optimization --- AppKit/CPTokenField.j | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/AppKit/CPTokenField.j b/AppKit/CPTokenField.j index 62a5b9912..437b67c85 100755 --- a/AppKit/CPTokenField.j +++ b/AppKit/CPTokenField.j @@ -312,8 +312,7 @@ var CPThemeStateAutoCompleting = @"CPThemeStateAutoCompleting", - (void)_updatePlaceholderState { - var objectValue = [self objectValue]; - if ((!objectValue || [objectValue count] === 0) && ![self hasThemeState:CPThemeStateEditing]) + if (([[self _tokens] count] === 0) && ![self hasThemeState:CPThemeStateEditing]) [self setThemeState:CPTextFieldStatePlaceholder]; else [self unsetThemeState:CPTextFieldStatePlaceholder];