diff --git a/Tablet.xcworkspace/xcuserdata/max.xcuserdatad/UserInterfaceState.xcuserstate b/Tablet.xcworkspace/xcuserdata/max.xcuserdatad/UserInterfaceState.xcuserstate index 87b4626..c9f97f2 100644 Binary files a/Tablet.xcworkspace/xcuserdata/max.xcuserdatad/UserInterfaceState.xcuserstate and b/Tablet.xcworkspace/xcuserdata/max.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Tablet/TableRowBuilder.swift b/Tablet/TableRowBuilder.swift index b3429d2..e1ba1bc 100644 --- a/Tablet/TableRowBuilder.swift +++ b/Tablet/TableRowBuilder.swift @@ -26,7 +26,7 @@ public typealias ReturnValue = AnyObject? enum ActionHandler { case Handler((data: ActionData) -> Void) - case ReturnValueHandler((data: ActionData) -> AnyObject?) + case ValueHandler((data: ActionData) -> AnyObject?) func invoke(data: ActionData) -> ReturnValue { @@ -34,7 +34,7 @@ enum ActionHandler { case .Handler(let handler): handler(data: data) return true - case .ReturnValueHandler(let handler): + case .ValueHandler(let handler): return handler(data: data) } } @@ -104,9 +104,9 @@ public class TableRowBuilder return self } - public func action(type: ActionType, handler: (data: ActionData) -> ReturnValue) -> Self { + public func valueAction(type: ActionType, handler: (data: ActionData) -> ReturnValue) -> Self { - actions[type.key] = .ReturnValueHandler(handler) + actions[type.key] = .ValueHandler(handler) return self } diff --git a/TabletDemo/Classes/Presentation/Controllers/MainController.swift b/TabletDemo/Classes/Presentation/Controllers/MainController.swift index 36f107f..2c1ad9e 100644 --- a/TabletDemo/Classes/Presentation/Controllers/MainController.swift +++ b/TabletDemo/Classes/Presentation/Controllers/MainController.swift @@ -22,9 +22,19 @@ class MainController: UIViewController { super.viewDidLoad() let rows = TableConfigurableRowBuilder(items: ["1", "2", "3"]) - .action(.click) { [unowned self] data -> Void in + .action(.click) { [unowned self] e in self.performSegueWithIdentifier("headerfooter", sender: nil) } + .valueAction(.click) { data in + return 10 + } + .action(.click) { data in + self.performSegueWithIdentifier("headerfooter", sender: nil) + } + .action(.click) { data in + + + } print("", String(TableDirector.self))