Merge pull request #26 from bjhomer/pull-requests/behavior-fixes

Bug fixes.
jasarien · Mar 21, 2013 · 560d3d6 · 560d3d6
2 parents 5feb558 + 25f437c
commit 560d3d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/JSTokenField/JSBackspaceReportingTextField.m b/JSTokenField/JSBackspaceReportingTextField.m
@@ -11,8 +11,11 @@
 @implementation JSBackspaceReportingTextField
 
 - (void)deleteBackward {
+    BOOL shouldDismiss = (self.text.length == 0);
+
     [super deleteBackward];
-    if (self.text.length == 0) {
+
+    if (shouldDismiss) {
         if ([self.delegate respondsToSelector:@selector(textField:shouldChangeCharactersInRange:replacementString:)]) {
             [self.delegate textField:self shouldChangeCharactersInRange:NSMakeRange(0, 0) replacementString:@""];
         }

diff --git a/JSTokenField/JSTokenField.m b/JSTokenField/JSTokenField.m
@@ -374,7 +374,8 @@ - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRang
 
 		NSString *name = [token titleForState:UIControlStateNormal];
 		// If we don't allow deleting the token, don't even bother letting it highlight
-		if ([self.delegate tokenField:self shouldRemoveToken:name representedObject:token.representedObject]) {
+		BOOL responds = [self.delegate respondsToSelector:@selector(tokenField:shouldRemoveToken:representedObject:)];
+		if (responds == NO || [self.delegate tokenField:self shouldRemoveToken:name representedObject:token.representedObject]) {
 			[token becomeFirstResponder];
 		}
 		return NO;