Skip to content
This repository was archived by the owner on Jun 17, 2018. It is now read-only.

Commit b8db5e6

Browse files
committed
Merge branch 'master' into swift3.0
Conflicts: Pod/Classes/PagingMenuController.swift
2 parents 85baaa6 + ab211f9 commit b8db5e6

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Pod/Classes/PagingMenuController.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,9 @@ open class PagingMenuController: UIViewController, PagingValidator {
269269

270270
switch (options.lazyLoadingPage, menuOptions.displayMode, page) {
271271
case (.three, .infinite, menuView?.previousPage ?? previousPage),
272-
(.three, .infinite, menuView?.nextPage ?? nextPage),
273-
(.three, _, previousPage),
274-
(.three, _, nextPage): break
275-
default: pagingViewController?.visibleControllers.forEach { $0.view.alpha = 0 }
272+
(.three, .infinite, menuView?.nextPage ?? nextPage): break
273+
case (.three, .infinite, _): pagingViewController?.visibleControllers.forEach { $0.view.alpha = 0 }
274+
default: break
276275
}
277276
}
278277

0 commit comments

Comments
 (0)