From f773bd217c42a047ab4d6f0c7c3e24938efe67c2 Mon Sep 17 00:00:00 2001 From: Alexander Ljungberg Date: Fri, 12 Aug 2011 19:46:39 -0400 Subject: [PATCH] Fixed with token field: remove false ivar '_tokenIndex' and fix tokenField:tokenField completionsForSubstring:indexOfToken:indexOfSelectedItem: ignoring its indexOfToken: parameter. --- AppKit/CPTokenField.j | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/AppKit/CPTokenField.j b/AppKit/CPTokenField.j index 26a93d318..61481d970 100755 --- a/AppKit/CPTokenField.j +++ b/AppKit/CPTokenField.j @@ -98,7 +98,6 @@ var CPThemeStateAutoCompleting = @"CPThemeStateAutoCompleting", if (self = [super initWithFrame:frame]) { _selectedRange = CPMakeRange(0, 0); - _tokenIndex = 0; _completionDelay = [CPTokenField defaultCompletionDelay]; _tokenizingCharacterSet = [[self class] defaultTokenizingCharacterSet]; [self setBezeled:YES]; @@ -164,7 +163,7 @@ var CPThemeStateAutoCompleting = @"CPThemeStateAutoCompleting", { var indexOfSelectedItem = 0; - _cachedCompletions = [self tokenField:self completionsForSubstring:[self _inputElement].value indexOfToken:_tokenIndex indexOfSelectedItem:indexOfSelectedItem]; + _cachedCompletions = [self tokenField:self completionsForSubstring:[self _inputElement].value indexOfToken:0 indexOfSelectedItem:indexOfSelectedItem]; [_autocompleteView selectRowIndexes:[CPIndexSet indexSetWithIndex:indexOfSelectedItem] byExtendingSelection:NO]; [_autocompleteView reloadData]; @@ -1128,7 +1127,7 @@ var CPThemeStateAutoCompleting = @"CPThemeStateAutoCompleting", { if ([[self delegate] respondsToSelector:@selector(tokenField:completionsForSubstring:indexOfToken:indexOfSelectedItem:)]) { - return [[self delegate] tokenField:tokenField completionsForSubstring:substring indexOfToken:_tokenIndex indexOfSelectedItem:selectedIndex]; + return [[self delegate] tokenField:tokenField completionsForSubstring:substring indexOfToken:tokenIndex indexOfSelectedItem:selectedIndex]; } return [];