Merge pull request #201 from XBeg9/onChangeCharacterInRange_return_fix

Make onChangeCharacterInRange block return BOOL
This commit is contained in:
Roman Efimov
2014-11-01 13:54:01 -07:00
2 changed files with 7 additions and 5 deletions

View File

@@ -196,15 +196,17 @@
- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
{
if (self.item.onChangeCharacterInRange)
self.item.onChangeCharacterInRange(self.item, range, string);
BOOL shouldChange = YES;
if (self.item.charactersLimit) {
NSUInteger newLength = textField.text.length + string.length - range.length;
return newLength <= self.item.charactersLimit;
shouldChange = newLength <= self.item.charactersLimit;
}
return YES;
if (self.item.onChangeCharacterInRange && shouldChange)
shouldChange = self.item.onChangeCharacterInRange(self.item, range, string);
return shouldChange;
}

View File

@@ -55,7 +55,7 @@
@property (copy, readwrite, nonatomic) void (^onEndEditing)(RETextItem *item);
@property (copy, readwrite, nonatomic) void (^onChange)(RETextItem *item);
@property (copy, readwrite, nonatomic) void (^onReturn)(RETextItem *item);
@property (copy, readwrite, nonatomic) void (^onChangeCharacterInRange)(RETextItem *item, NSRange range, NSString *replacementString);
@property (copy, readwrite, nonatomic) BOOL (^onChangeCharacterInRange)(RETextItem *item, NSRange range, NSString *replacementString);
+ (instancetype)itemWithTitle:(NSString *)title value:(NSString *)value;