Merge pull request #131 from zidaneno5/master

- Resolve retain cycle in setActionTappedHandler - Fix a bug when adding an action with "enabled = false" - the titleLabel is still enabled
sberrevoets · Dec 15, 2015 · 98b1dde · 98b1dde
2 parents 7737828 + 6f7e591
commit 98b1dde
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Source/Actions/AlertAction.swift b/Source/Actions/AlertAction.swift
@@ -66,5 +66,7 @@ public class AlertAction: NSObject {
         didSet { self.actionView?.enabled = self.enabled }
     }
 
-    var actionView: ActionCell?
+    var actionView: ActionCell? {
+        didSet { self.actionView?.enabled = self.enabled }
+    }
 }
diff --git a/Source/AlertController.swift b/Source/AlertController.swift
@@ -269,9 +269,9 @@ public class AlertController: UIViewController {
 
         self.alertView.prepareLayout()
 
-        self.alertView.setActionTappedHandler { action in
-            guard self.shouldDismissHandler?(action) != false else { return }
-            self.presentingViewController?.dismissViewControllerAnimated(true) {
+        self.alertView.setActionTappedHandler { [weak self] action in
+            guard self?.shouldDismissHandler?(action) != false else { return }
+            self?.presentingViewController?.dismissViewControllerAnimated(true) {
                 action.handler?(action)
             }
         }