Merge pull request #11 from Jack-Rouleau/sender-button-action

Added the sender object to the action protocol method, if delegate me…
younatics · Oct 12, 2017 · 87bf236 · 87bf236
2 parents f12805e + 1a74a03
commit 87bf236
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/MediaBrowser/MediaBrowser.swift b/MediaBrowser/MediaBrowser.swift
@@ -1512,6 +1512,9 @@ public class MediaBrowser: UIViewController, UIScrollViewDelegate, UIActionSheet
         if let gc = gridController {
             if gc.selectionMode {
                 self.title = NSLocalizedString("Select Photos", comment: "")
+                if let ab = actionButton {
+                    self.navigationItem.rightBarButtonItem = ab
+                }
             } else {
                 let photosText: String
 
@@ -2059,7 +2062,8 @@ public class MediaBrowser: UIViewController, UIScrollViewDelegate, UIActionSheet
                 // If they have defined a delegate method then just message them
                 // Let delegate handle things
                 if let d = delegate {
-                    d.actionButtonPressed(at: currentPageIndex, in: self)
+                    d.actionButtonPressed(at: currentPageIndex, in: self, sender: sender)
+                    return
                 }
 
                 // Show activity view controller

diff --git a/MediaBrowser/MediaBrowserDelegate.swift b/MediaBrowser/MediaBrowserDelegate.swift
@@ -67,7 +67,7 @@ public protocol MediaBrowserDelegate: class {
      - Parameter photoIndex: Int
      - Parameter mediaBrowser: MediaBrowser
      */
-    func actionButtonPressed(at photoIndex: Int, in mediaBrowser: MediaBrowser)
+    func actionButtonPressed(at photoIndex: Int, in mediaBrowser: MediaBrowser, sender: Any?)
 
 
     /**
@@ -114,7 +114,7 @@ public extension MediaBrowserDelegate {
 
     func didDisplayMedia(at index: Int, in mediaBrowser: MediaBrowser) { }
 
-    func actionButtonPressed(at photoIndex: Int, in mediaBrowser: MediaBrowser) { }
+    func actionButtonPressed(at photoIndex: Int, in mediaBrowser: MediaBrowser, sender: Any? = nil) { }
 
     func isMediaSelected(at index: Int, in mediaBrowser: MediaBrowser) -> Bool { return false }