This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Pod/Classes/WPMediaPickerViewController.m b/Pod/Classes/WPMediaPickerViewController.m | |
| index 0c90262..821b457 100644 | |
| --- a/Pod/Classes/WPMediaPickerViewController.m | |
| +++ b/Pod/Classes/WPMediaPickerViewController.m | |
| @@ -659,11 +659,12 @@ - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker | |
| - (void)setGroup:(id<WPMediaGroup>)group { | |
| if (group == [self.dataSource selectedGroup]){ | |
| - [self dismissViewControllerAnimated:YES completion:nil]; | |
| return; |
frosty
/ MediaPickerPreview.diff
Last active
January 13, 2017 15:05
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Pod/Classes/WPFullScreenAssetPreviewViewController.m b/Pod/Classes/WPFullScreenAssetPreviewViewController.m | |
| index 3765e0c..8ad225d 100644 | |
| --- a/Pod/Classes/WPFullScreenAssetPreviewViewController.m | |
| +++ b/Pod/Classes/WPFullScreenAssetPreviewViewController.m | |
| @@ -143,4 +143,9 @@ - (void)handleTapOnAsset:(UIGestureRecognizer *)gestureRecognizer | |
| } | |
| } | |
| +- (CGSize)preferredContentSize | |
| +{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift b/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift | |
| index 1ea4a35..03ec48c 100644 | |
| --- a/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift | |
| +++ b/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift | |
| @@ -98,6 +98,14 @@ class WPSplitViewController: UISplitViewController { | |
| return UITraitCollection(traitsFromCollections: [collection, overrideCollection]) | |
| } | |
| + override func viewWillAppear(animated: Bool) { | |
| + super.viewWillAppear(animated) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Utility/WPFeedbackGenerators.swift b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| index 04a9ac9..228c9d2 100644 | |
| --- a/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| +++ b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| @@ -28,7 +28,11 @@ class WPNotificationFeedbackGenerator: NSObject { | |
| return | |
| } | |
| - let generator = UINotificationFeedbackGenerator() | |
| + notificationOccurred(notificationType, withGenerator: UINotificationFeedbackGenerator()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Utility/WPFeedbackGenerators.swift b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| index 04a9ac9..228c9d2 100644 | |
| --- a/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| +++ b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| @@ -28,7 +28,11 @@ class WPNotificationFeedbackGenerator: NSObject { | |
| return | |
| } | |
| - let generator = UINotificationFeedbackGenerator() | |
| + notificationOccurred(notificationType, withGenerator: UINotificationFeedbackGenerator()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Utility/WPFeedbackGenerators.swift b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| index 04a9ac9..228c9d2 100644 | |
| --- a/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| +++ b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| @@ -28,7 +28,11 @@ class WPNotificationFeedbackGenerator: NSObject { | |
| return | |
| } | |
| - let generator = UINotificationFeedbackGenerator() | |
| + notificationOccurred(notificationType, withGenerator: UINotificationFeedbackGenerator()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Utility/WPFeedbackGenerators.swift b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| index 04a9ac9..228c9d2 100644 | |
| --- a/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| +++ b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| @@ -28,7 +28,11 @@ class WPNotificationFeedbackGenerator: NSObject { | |
| return | |
| } | |
| - let generator = UINotificationFeedbackGenerator() | |
| + notificationOccurred(notificationType, withGenerator: UINotificationFeedbackGenerator()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Utility/WPFeedbackGenerators.swift b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| index 04a9ac9..228c9d2 100644 | |
| --- a/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| +++ b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| @@ -28,7 +28,11 @@ class WPNotificationFeedbackGenerator: NSObject { | |
| return | |
| } | |
| - let generator = UINotificationFeedbackGenerator() | |
| + notificationOccurred(notificationType, withGenerator: UINotificationFeedbackGenerator()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m | |
| index 2857058..06eab07 100644 | |
| --- a/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m | |
| +++ b/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m | |
| @@ -712,7 +712,12 @@ - (void)showStats | |
| StatsViewController *statsView = [StatsViewController new]; | |
| statsView.blog = self.blog; | |
| statsView.statsService = self.statsService; | |
| - [self showDetailViewController:statsView sender:self]; | |
| + |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Simperium/SPAuthenticator.h b/Simperium/SPAuthenticator.h | |
| index 6148933..83c1a54 100644 | |
| --- a/Simperium/SPAuthenticator.h | |
| +++ b/Simperium/SPAuthenticator.h | |
| @@ -22,6 +22,7 @@ typedef void(^FailedBlockType)(int responseCode, NSString *responseString); | |
| @protocol SPAuthenticatorDelegate <NSObject> | |
| @optional | |
| - (void)authenticationDidSucceedForUsername:(NSString *)username token:(NSString *)token; | |
| +- (void)authenticationDidCreateAccount; | |
| - (void)authenticationDidFail; |