Skip to content

Commit

Permalink
Merge pull request #29 from gplocke/master
Browse files Browse the repository at this point in the history
Added ability for the downpicker to send events when editing the textfield
  • Loading branch information
Darkseal committed Nov 6, 2015
2 parents 709abf3 + 22a9ed1 commit 29e504a
Show file tree
Hide file tree
Showing 14 changed files with 405 additions and 336 deletions.
4 changes: 2 additions & 2 deletions Example/DownPicker.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
B81C30801E3E23D3B0FCFB8B /* Pods_DownPicker_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FFFD38B44898373D54B724BC /* Pods_DownPicker_Example.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
D2B5134B619EF5195D488787 /* Pods_DownPicker_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 364DB25569FF9082DF7A304A /* Pods_DownPicker_Tests.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
B81C30801E3E23D3B0FCFB8B /* Pods_DownPicker_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FFFD38B44898373D54B724BC /* Pods_DownPicker_Example.framework */; };
D2B5134B619EF5195D488787 /* Pods_DownPicker_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 364DB25569FF9082DF7A304A /* Pods_DownPicker_Tests.framework */; };
F2CD24831BA1F6AA0054CC54 /* DownPicker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2CD24821BA1F6AA0054CC54 /* DownPicker.framework */; settings = {ATTRIBUTES = (Required, ); }; };
/* End PBXBuildFile section */

Expand Down
8 changes: 4 additions & 4 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
PODS:
- DownPicker (0.1.31)
- DownPicker (0.1.34)

DEPENDENCIES:
- DownPicker (from `../`)

EXTERNAL SOURCES:
DownPicker:
:path: ../
:path: "../"

SPEC CHECKSUMS:
DownPicker: d8e4ad820dbb8f424025202865ee8fba590b1092
DownPicker: c00ea63f08ae82116cc93d0eba74e86bf3d4c68e

COCOAPODS: 0.38.2
COCOAPODS: 0.39.0
6 changes: 3 additions & 3 deletions Example/Pods/Local Podspecs/DownPicker.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

554 changes: 278 additions & 276 deletions Example/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Target Support Files/DownPicker/Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion Pod/Classes/DownPicker.m
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,15 @@ - (BOOL)textFieldShouldBeginEditing:(UITextField *)aTextField
return NO;
}

- (void)textFieldDidBeginEditing:(UITextField *)textField
{
[self sendActionsForControlEvents:UIControlEventEditingDidBegin];
}

- (void)textFieldDidEndEditing:(UITextField *)aTextField {
// [self doneClicked:aTextField];
[self doneClicked:aTextField];
aTextField.userInteractionEnabled = YES;
[self sendActionsForControlEvents:UIControlEventEditingDidEnd];
}

- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
Expand Down

0 comments on commit 29e504a

Please sign in to comment.