GitHub/SideMenu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing behavior to present a menu if pushing isn't available as more true to expected behavior.

Browse Source
This commit is contained in:
jonkykong
2016-10-19 23:26:07 -07:00
parent 697dce16db
commit 0de56fefeb
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pod/Classes/UISideMenuNavigationController.swift
+2 -8
View File
@@ -119,7 +119,7 @@ open class UISideMenuNavigationController: UINavigationController {
}
override open func pushViewController(_ viewController: UIViewController, animated: Bool) {
guard viewControllers.count > 0 else {
guard viewControllers.count > 0 && !SideMenuManager.menuAllowSubmenus else {
// NOTE: pushViewController is called by init(rootViewController: UIViewController)
// so we must perform the normal super method in this case.
super.pushViewController(viewController, animated: true)
@@ -127,13 +127,7 @@ open class UISideMenuNavigationController: UINavigationController {
}
guard let presentingViewController = presentingViewController as? UINavigationController else {
present(viewController, animated: animated, completion: nil)
print("SideMenu Warning: cannot push a ViewController from a ViewController without a NavigationController. It will be presented it instead.")
return
}
if SideMenuManager.menuAllowSubmenus{
super.pushViewController(viewController, animated: true)
print("SideMenu Warning: attempt to push a ViewController from a ViewController without a NavigationController. Your ViewController must be embedded in a NavigationController for this to work.")
return
}