fluent: show block added

lolgear · lolgear · commit c1d4457900fe · 2016-03-06T19:12:12.000+03:00
diff --git a/SCLAlertView/SCLAlertView.h b/SCLAlertView/SCLAlertView.h
@@ -448,7 +448,7 @@ typedef NS_ENUM(NSInteger, SCLAlertViewBackground)
 
 @interface SCLAlertViewShowBuilder : NSObject
 
-@property(strong, nonatomic, readonly) UIViewController *parameterViewController;
+@property(weak, nonatomic, readonly) UIViewController *parameterViewController;
 @property(copy, nonatomic, readonly) UIImage *parameterImage;
 @property(copy, nonatomic, readonly) UIColor *parameterColor;
 @property(copy, nonatomic, readonly) NSString *parameterTitle;
@@ -471,6 +471,7 @@ typedef NS_ENUM(NSInteger, SCLAlertViewBackground)
 
 - (void)showAlertView:(SCLAlertView *)alertView;
 - (void)showAlertView:(SCLAlertView *)alertView onViewController:(UIViewController *)controller;
+@property(copy, nonatomic, readonly) void (^show)(SCLAlertView *view, UIViewController *controller);
 @end
 
 @interface SCLALertViewTextFieldBuilder : NSObject
diff --git a/SCLAlertView/SCLAlertView.m b/SCLAlertView/SCLAlertView.m
@@ -2085,7 +2085,7 @@ - (instancetype)initWithNewWindowWidth:(CGFloat)width {
 @end
 
 @interface SCLAlertViewShowBuilder()
-@property(strong, nonatomic) UIViewController *parameterViewController;
+@property(weak, nonatomic) UIViewController *parameterViewController;
 @property(copy, nonatomic) UIImage *parameterImage;
 @property(copy, nonatomic) UIColor *parameterColor;
 @property(copy, nonatomic) NSString *parameterTitle;
@@ -2105,6 +2105,9 @@ @interface SCLAlertViewShowBuilder()
 @property(copy, nonatomic) SCLAlertViewShowBuilder *(^style)(SCLAlertViewStyle style);
 @property(copy, nonatomic) SCLAlertViewShowBuilder *(^closeButtonTitle)(NSString *closeButtonTitle);
 @property(copy, nonatomic) SCLAlertViewShowBuilder *(^duration)(NSTimeInterval duration);
+
+#pragma mark - Show
+@property(copy, nonatomic) void (^show)(SCLAlertView *view, UIViewController *controller);
 @end
 
 @implementation SCLAlertViewShowBuilder
@@ -2208,12 +2211,24 @@ - (void)showAlertView:(SCLAlertView *)alertView {
 }
 
 - (void)showAlertView:(SCLAlertView *)alertView onViewController:(UIViewController *)controller {
+    UIViewController *targetController = controller ? controller : self.parameterViewController;
+    
     if (self.parameterImage || self.parameterColor) {
-        [alertView showTitle:controller image:self.parameterImage color:self.parameterColor title:self.parameterTitle subTitle:self.parameterSubTitle duration:self.parameterDuration completeText:self.parameterCloseButtonTitle style:self.parameterStyle];
+        [alertView showTitle:targetController image:self.parameterImage color:self.parameterColor title:self.parameterTitle subTitle:self.parameterSubTitle duration:self.parameterDuration completeText:self.parameterCloseButtonTitle style:self.parameterStyle];
     }
     else {
-        [alertView showTitle:controller title:self.parameterTitle subTitle:self.parameterSubTitle style:self.parameterStyle closeButtonTitle:self.parameterCloseButtonTitle duration:self.parameterDuration];
+        [alertView showTitle:targetController title:self.parameterTitle subTitle:self.parameterSubTitle style:self.parameterStyle closeButtonTitle:self.parameterCloseButtonTitle duration:self.parameterDuration];
+    }
+}
+
+- (void (^)(SCLAlertView *view, UIViewController *controller))show {
+    if (!_show) {
+        __weak typeof(self) weakSelf = self;
+        _show = ^(SCLAlertView *view, UIViewController *controller) {
+            [weakSelf showAlertView:view onViewController:controller];
+        };
     }
+    return _show;
 }
 
 @end
