Merge pull request #3 from kwosu87/option_for_done_button

Provide an option for adding 'Done Button'
devxoul · Feb 17, 2016 · b8aa6d6 · b8aa6d6
2 parents d424320 + 7ac4173
commit b8aa6d6
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Carte/CarteViewController.swift b/Carte/CarteViewController.swift
@@ -45,8 +45,16 @@ public class CarteViewController: UITableViewController {
     }
 
     public override func viewWillAppear(animated: Bool) {
-        if self.presentingViewController != nil && self.navigationItem.leftBarButtonItem == nil {
-            self.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Done,
+        super.viewWillAppear(animated)
+
+        // pushed
+        if self.navigationController?.viewControllers.count > 1 {
+            self.navigationItem.leftBarButtonItem = nil
+        }
+        // presented
+        else if self.presentingViewController != nil && self.navigationItem.leftBarButtonItem == nil {
+            self.navigationItem.leftBarButtonItem = UIBarButtonItem(
+                barButtonSystemItem: .Done,
                 target: self,
                 action: "doneButtonDidTap"
             )