Merge branch 'adjusted-insets' into swift-3.0

Dylan Ginsburg · Dylan Ginsburg · commit 87c65732b382 · 2016-12-02T06:42:37.000-05:00
# Conflicts:
#	Turbolinks/VisitableView.swift
diff --git a/Turbolinks/VisitableView.swift b/Turbolinks/VisitableView.swift
@@ -188,8 +188,7 @@ open class VisitableView: UIView {
 
     private func needsUpdateForContentInsets(_ insets: UIEdgeInsets) -> Bool {
         guard let scrollView = webView?.scrollView else { return false }
-        return (scrollView.contentInset.top != insets.top && insets.top != 0) ||
-            (scrollView.contentInset.bottom != insets.bottom && insets.bottom != 0)
+        return scrollView.contentInset.top != adjustedInsets.top || scrollView.contentInset.bottom != adjustedInsets.bottom
     }
 
     private func updateWebViewScrollViewInsets(_ insets: UIEdgeInsets) {

Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,7 @@ open class VisitableView: UIView {`
`188`	`188`
`189`	`189`	`private func needsUpdateForContentInsets(_ insets: UIEdgeInsets) -> Bool {`
`190`	`190`	`guard let scrollView = webView?.scrollView else { return false }`
`191`		`- return (scrollView.contentInset.top != insets.top && insets.top != 0) \|\|`
`192`		`- (scrollView.contentInset.bottom != insets.bottom && insets.bottom != 0)`
	`191`	`+ return scrollView.contentInset.top != adjustedInsets.top \|\| scrollView.contentInset.bottom != adjustedInsets.bottom`
`193`	`192`	`}`
`194`	`193`
`195`	`194`	`private func updateWebViewScrollViewInsets(_ insets: UIEdgeInsets) {`