Skip to content

Commit d620b3f

Browse files
committed
Merge pull request #64 from mrvincenzo/master
Fix placeholder bug that remained hidden although it should has been shown
2 parents 8124fd4 + 782ff34 commit d620b3f

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

TITokenField.m

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,9 +560,18 @@ - (void)didEndEditing {
560560

561561
- (void)didChangeText {
562562
if (!self.text.length) {
563-
[self setText:kTextEmpty];
564-
[_placeHolderLabel setHidden:NO];
565-
} else [_placeHolderLabel setHidden:YES];
563+
[self setText:kTextEmpty];
564+
}
565+
566+
[self showOrHidePlaceHolderLabel];
567+
}
568+
569+
- (void) showOrHidePlaceHolderLabel {
570+
if (([self.text isEqualToString:kTextEmpty]) && ([_tokens count] == 0)) {
571+
[_placeHolderLabel setHidden:NO];
572+
} else {
573+
[_placeHolderLabel setHidden:YES];
574+
}
566575
}
567576

568577
- (BOOL)canPerformAction:(SEL)action withSender:(id)sender {
@@ -618,7 +627,7 @@ - (void)addToken:(TIToken *)token {
618627
[delegate tokenField:self didAddToken:token];
619628
}
620629

621-
[_placeHolderLabel setHidden:YES];
630+
[self showOrHidePlaceHolderLabel];
622631
}
623632

624633
[self setResultsModeEnabled:NO];
@@ -644,6 +653,8 @@ - (void)removeToken:(TIToken *)token {
644653
[delegate tokenField:self didRemoveToken:token];
645654
}
646655

656+
[self showOrHidePlaceHolderLabel];
657+
647658
[self setResultsModeEnabled:_forcePickSearchResult];
648659
}
649660
}

0 commit comments

Comments
 (0)