Skip to content

Pull from master repo #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
May 6, 2019
Merged

Pull from master repo #3

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e460722
Fire cancel event from ios
ArcadeMode Jun 26, 2018
bc4929d
small fix
ArcadeMode Jun 26, 2018
4e2863f
sometimes cancel would still not send an event
ArcadeMode Jun 29, 2018
318dfcf
Add Japanese Language Support.
hayashizaki-masayuki Aug 30, 2018
69f6ec3
bump
EddyVerbruggen Jan 18, 2019
b72c376
Merge pull request #128 from ArcadeMode/master
EddyVerbruggen Feb 18, 2019
fee1ef3
bump
EddyVerbruggen Feb 18, 2019
dc70f4e
Merge pull request #138 from sakaitaka/add_japanese_language_support
EddyVerbruggen Feb 18, 2019
ffbbb7b
Added missing spanish translations(#146) and adjusted discard/ok butt…
hyeritsyan Mar 5, 2019
d44098d
Fix android TransactionTooLargeException
hkjeffchan Mar 11, 2019
2d9ed07
add ResultIPC.java to plugin.xml
hkjeffchan Mar 20, 2019
c34e17b
Merge pull request #150 from hkjeffchan/master
EddyVerbruggen Mar 21, 2019
a53f9b5
bump
EddyVerbruggen Mar 21, 2019
957c0df
Merge pull request #149 from okode/translations-spanish
EddyVerbruggen Mar 26, 2019
490d90b
bump
EddyVerbruggen Mar 26, 2019
6a40fc9
Fix typos in the German translation
uaza Mar 27, 2019
9f41af3
Merge pull request #153 from uaza/master
EddyVerbruggen Mar 27, 2019
4a8e6f6
bump
EddyVerbruggen Mar 27, 2019
e26ca86
Fix - https://github.com/Telerik-Verified-Plugins/ImagePicker/issues/95
anujraghuvanshi Apr 29, 2019
6c52270
Fix- https://github.com/Telerik-Verified-Plugins/ImagePicker/issues/95
anujraghuvanshi Apr 29, 2019
ce7ce9d
Fix - https://github.com/Telerik-Verified-Plugins/ImagePicker/issues/143
anujraghuvanshi Apr 29, 2019
16244b5
Merge pull request #155 from Anuj-Raghuvanshi/master
anujraghuvanshi Apr 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
small fix
  • Loading branch information
@ArcadeMode
ArcadeMode authored Jun 26, 2018
commit bc4929d44172aa5247374ae000ff6a334770b839
9 changes: 4 additions & 5 deletions src/ios/SOSPicker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,11 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking

- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker
{
[picker.presentingViewController dismissViewControllerAnimated:YES completion:nil];
[self.viewController dismissViewControllerAnimated:YES completion:nil];
CDVPluginResult* pluginResult = nil;
CDVPluginResult* pluginResult = nil;
NSArray* emptyArray = [NSArray array];
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:emptyArray];
[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackId];
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:emptyArray];
[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackId];
[self.viewController dismissViewControllerAnimated:YES completion:nil];
NSLog(@"UIImagePickerController: User pressed cancel button");
}

Expand Down