Added completion block after presentation

nicolaschengdev · Feb 15, 2014 · 2e70efd · 2e70efd
1 parent 9346b41
commit 2e70efd
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 11 deletions.
diff --git a/WYPopoverController/WYPopoverController.h b/WYPopoverController/WYPopoverController.h
@@ -1,5 +1,5 @@
 /*
- Version 0.1.8
+ Version 0.1.9
  
  WYPopoverController is available under the MIT license.
  
@@ -135,14 +135,28 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverAnimationOptions) {
                     completion:(void (^)(void))completion;
 
 
+//
+
 - (void)presentPopoverFromBarButtonItem:(UIBarButtonItem *)item
                permittedArrowDirections:(WYPopoverArrowDirection)arrowDirections
                                animated:(BOOL)animated
                                 options:(WYPopoverAnimationOptions)options;
 
+- (void)presentPopoverFromBarButtonItem:(UIBarButtonItem *)item
+               permittedArrowDirections:(WYPopoverArrowDirection)arrowDirections
+                               animated:(BOOL)animated
+                                options:(WYPopoverAnimationOptions)options
+                             completion:(void (^)(void))completion;
+
+//
+
 - (void)presentPopoverAsDialogAnimated:(BOOL)animated
                                options:(WYPopoverAnimationOptions)options;
 
+- (void)presentPopoverAsDialogAnimated:(BOOL)animated
+                               options:(WYPopoverAnimationOptions)options
+                            completion:(void (^)(void))completion;
+
 //
 
 - (void)dismissPopoverAnimated:(BOOL)animated;

diff --git a/WYPopoverController/WYPopoverController.m b/WYPopoverController/WYPopoverController.m
@@ -1,5 +1,5 @@
 /*
- Version 0.1.8
+ Version 0.1.9
  
  WYPopoverController is available under the MIT license.
  
@@ -1708,29 +1708,53 @@ - (void)presentPopoverFromRect:(CGRect)aRect
     overlayView.isAccessibilityElement = YES;
 }
 
-- (void)presentPopoverFromBarButtonItem:(UIBarButtonItem *)item
-               permittedArrowDirections:(WYPopoverArrowDirection)arrowDirections
+- (void)presentPopoverFromBarButtonItem:(UIBarButtonItem *)aItem
+               permittedArrowDirections:(WYPopoverArrowDirection)aArrowDirections
                                animated:(BOOL)aAnimated
                                 options:(WYPopoverAnimationOptions)aOptions
 {
-    barButtonItem = item;
+    [self presentPopoverFromBarButtonItem:aItem
+                 permittedArrowDirections:aArrowDirections
+                                 animated:aAnimated
+                                  options:aOptions
+                               completion:nil];
+}
+
+- (void)presentPopoverFromBarButtonItem:(UIBarButtonItem *)aItem
+               permittedArrowDirections:(WYPopoverArrowDirection)aArrowDirections
+                               animated:(BOOL)aAnimated
+                                options:(WYPopoverAnimationOptions)aOptions
+                             completion:(void (^)(void))completion
+{
+    barButtonItem = aItem;
     UIView *itemView = [barButtonItem valueForKey:@"view"];
-    arrowDirections = WYPopoverArrowDirectionDown | WYPopoverArrowDirectionUp;
+    aArrowDirections = WYPopoverArrowDirectionDown | WYPopoverArrowDirectionUp;
     [self presentPopoverFromRect:itemView.bounds
                           inView:itemView
-        permittedArrowDirections:arrowDirections
+        permittedArrowDirections:aArrowDirections
                         animated:aAnimated
-                         options:aOptions];
+                         options:aOptions
+                      completion:completion];
+}
+
+- (void)presentPopoverAsDialogAnimated:(BOOL)aAnimated
+                               options:(WYPopoverAnimationOptions)aOptions
+{
+    [self presentPopoverAsDialogAnimated:aAnimated
+                                 options:aOptions
+                              completion:nil];
 }
 
 - (void)presentPopoverAsDialogAnimated:(BOOL)aAnimated
                                options:(WYPopoverAnimationOptions)aOptions
+                            completion:(void (^)(void))completion
 {
     [self presentPopoverFromRect:CGRectZero
                           inView:nil
         permittedArrowDirections:WYPopoverArrowDirectionNone
                         animated:aAnimated
-                         options:aOptions];
+                         options:aOptions
+                      completion:completion];
 }
 
 - (CGAffineTransform)transformTranslateForArrowDirection:(WYPopoverArrowDirection)arrowDirection

diff --git a/WYPopoverController/WYStoryboardPopoverSegue.h b/WYPopoverController/WYStoryboardPopoverSegue.h
@@ -1,5 +1,5 @@
 /*
- Version 0.1.8
+ Version 0.1.9
  
  WYPopoverController is available under the MIT license.
  

diff --git a/WYPopoverController/WYStoryboardPopoverSegue.m b/WYPopoverController/WYStoryboardPopoverSegue.m
@@ -1,5 +1,5 @@
 /*
- Version 0.1.8
+ Version 0.1.9
  
  WYPopoverController is available under the MIT license.