TouchInstinct
/
SKPhotoBrowser
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #57 from suzuki-0000/bugfix/st 

[bugfix]#43 SKPhotoBrowser can't be destroied fixed.
This commit is contained in:
keishi suzuki 2016-03-18 10:57:12 +09:00
parent 5b7b2f7f01 3bacde025b
commit 18d8aec3ce
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SKPhotoBrowser/SKPhotoBrowser.swift
View File

@ -591,6 +591,7 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
}
public func prepareForClosePhotoBrowser() {
cancelControlHiding()
applicationWindow.removeGestureRecognizer(panGesture)
NSObject.cancelPreviousPerformRequestsWithTarget(self)
}

26
SKPhotoBrowser/SKZoomingScrollView.swift
View File

@ -21,7 +21,7 @@ public class SKZoomingScrollView: UIScrollView, UIScrollViewDelegate, SKDetectin
}
private(set) var photoImageView: SKDetectingImageView!
private weak var photoBrowser: SKPhotoBrowser!
private weak var photoBrowser: SKPhotoBrowser?
private var tapView: SKDetectingView!
private var indicatorView: SKIndicatorView!
@ -41,6 +41,9 @@ public class SKZoomingScrollView: UIScrollView, UIScrollViewDelegate, SKDetectin
setup()
}
deinit {
photoBrowser = nil
}
func setup() {
// tap
@ -72,7 +75,6 @@ public class SKZoomingScrollView: UIScrollView, UIScrollViewDelegate, SKDetectin
// MARK: - override
public override func layoutSubviews() {
tapView.frame = bounds
super.layoutSubviews()
@ -162,9 +164,7 @@ public class SKZoomingScrollView: UIScrollView, UIScrollViewDelegate, SKDetectin
zoomScale = 1
contentSize = CGSize.zero
let image = photoBrowser.imageForPhoto(photo)
if let image = image {
if let image = photoBrowser?.imageForPhoto(photo) {
// indicator
indicatorView.stopAnimating()
@ -195,7 +195,9 @@ public class SKZoomingScrollView: UIScrollView, UIScrollViewDelegate, SKDetectin
// MARK: - handle tap
public func handleDoubleTap(touchPoint: CGPoint) {
NSObject.cancelPreviousPerformRequestsWithTarget(photoBrowser)
if let photoBrowser = photoBrowser {
NSObject.cancelPreviousPerformRequestsWithTarget(photoBrowser)
}
if zoomScale > minimumZoomScale {
// zoom out
@ -211,7 +213,7 @@ public class SKZoomingScrollView: UIScrollView, UIScrollViewDelegate, SKDetectin
}
// delay control
photoBrowser.hideControlsAfterDelay()
photoBrowser?.hideControlsAfterDelay()
}
public func zoomRectForScrollViewWith(scale: CGFloat, touchPoint: CGPoint) -> CGRect {
@ -229,7 +231,7 @@ public class SKZoomingScrollView: UIScrollView, UIScrollViewDelegate, SKDetectin
}
public func scrollViewWillBeginZooming(scrollView: UIScrollView, withView view: UIView?) {
photoBrowser.cancelControlHiding()
photoBrowser?.cancelControlHiding()
}
public func scrollViewDidZoom(scrollView: UIScrollView) {
@ -240,13 +242,13 @@ public class SKZoomingScrollView: UIScrollView, UIScrollViewDelegate, SKDetectin
// MARK: - SKDetectingViewDelegate
func handleSingleTap(view: UIView, touch: UITouch) {
if photoBrowser.enableZoomBlackArea == true {
photoBrowser.toggleControls()
if photoBrowser?.enableZoomBlackArea == true {
photoBrowser?.toggleControls()
}
}
func handleDoubleTap(view: UIView, touch: UITouch) {
if photoBrowser.enableZoomBlackArea == true {
if photoBrowser?.enableZoomBlackArea == true {
let needPoint = getViewFramePercent(view, touch: touch)
handleDoubleTap(needPoint)
}
@ -275,7 +277,7 @@ public class SKZoomingScrollView: UIScrollView, UIScrollViewDelegate, SKDetectin
// MARK: - SKDetectingImageViewDelegate
func handleImageViewSingleTap(view: UIImageView, touch: UITouch) {
photoBrowser.toggleControls()
photoBrowser?.toggleControls()
}
func handleImageViewDoubleTap(view: UIImageView, touch: UITouch) {