Merge branch 'develop' into feature/documentation

Olga Konoreva · web-flow · commit 81abfe64fc2b · 2017-06-05T16:47:57.000+06:00
diff --git a/Sources/MenuAnimator.swift b/Sources/MenuAnimator.swift
@@ -482,10 +482,10 @@ class MenuInteractiveTransition: NSObject, UIViewControllerInteractiveTransition
                 }
                 
             case .changed:
-                guard let transitionContext = transitionContext else {
-                    fatalError("Invalid `transitionContext` value. This property should not be nil")
-                }
                 if transitionStarted && (present && dx > 0 || !present && dx < 0) {
+                    guard let transitionContext = transitionContext else {
+                        fatalError("Invalid `transitionContext` value. This property should not be nil")
+                    }
                     updateTransition(percentComplete: progress)
                     transitionContext.updateInteractiveTransition(progress)
                 }

Original file line number	Diff line number	Diff line change
`@@ -482,10 +482,10 @@ class MenuInteractiveTransition: NSObject, UIViewControllerInteractiveTransition`
`482`	`482`	`}`
`483`	`483`
`484`	`484`	`case .changed:`
`485`		`- guard let transitionContext = transitionContext else {`
`486`		- fatalError("Invalid `transitionContext` value. This property should not be nil")
`487`		`- }`
`488`	`485`	`if transitionStarted && (present && dx > 0 \|\| !present && dx < 0) {`
	`486`	`+ guard let transitionContext = transitionContext else {`
	`487`	+ fatalError("Invalid `transitionContext` value. This property should not be nil")
	`488`	`+ }`
`489`	`489`	`updateTransition(percentComplete: progress)`
`490`	`490`	`transitionContext.updateInteractiveTransition(progress)`
`491`	`491`	`}`