Fixes merge

jdshaoheyi · Aug 16, 2013 · aaf8985 · aaf8985
1 parent d0a0fc4
commit aaf8985
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/quickdialog/QDecimalTableViewCell.m b/quickdialog/QDecimalTableViewCell.m
@@ -76,12 +76,17 @@ - (void)updateElementFromTextField:(NSString *)value {
 }
 
 - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)replacement {
-    NSString *newValue = [_textField.text stringByReplacingCharactersInRange:range withString:replacement];
-    [self updateElementFromTextField:newValue];
-    [self updateTextFieldFromElement];
+    BOOL shouldChange = YES;
 
-    [_entryElement handleEditingChanged:self];
-
+    if(_entryElement && _entryElement.delegate && [_entryElement.delegate respondsToSelector:@selector(QEntryShouldChangeCharactersInRange:withString:forElement:andCell:)])
+        shouldChange = [_entryElement.delegate QEntryShouldChangeCharactersInRange:range withString:replacement forElement:_entryElement andCell:self];
+
+    if( shouldChange ) {
+        NSString *newValue = [_textField.text stringByReplacingCharactersInRange:range withString:replacement];
+        [self updateElementFromTextField:newValue];
+        [self updateTextFieldFromElement];
+        [_entryElement handleEditingChanged:self];
+    }
     return NO;
 }
 

diff --git a/quickdialog/QuickDialog.h b/quickdialog/QuickDialog.h
@@ -37,6 +37,7 @@
 #import "QBadgeElement.h"
 #import "QBooleanElement.h"
 #import "QButtonElement.h"
+#import "QuickDialogEntryElementDelegate.h"
 #import "QEntryElement.h"
 #import "QEntryTableViewCell.h"
 #import "QDateTimeInlineElement.h"
@@ -60,7 +61,6 @@
 #import "QColorPickerElement.h"
 #import "UIColor+ColorUtilities.h"
 #import "QProgressElement.h"
-#import "QuickDialogEntryElementDelegate.h"
 #import "QuickDialogController+Loading.h"
 #import "QAutoEntryElement.h"
 #import "QAutoEntryTableViewCell.h"