From 081e8be12a44d2b4c04c608852438ee555eb27bd Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sat, 22 Aug 2015 20:14:51 -0400
Subject: [PATCH] simplifying more nav logic
---
js/models/AppState.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/js/models/AppState.js b/js/models/AppState.js
index eca22a9e..60e6ac32 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -107,10 +107,12 @@ define(['underscore', 'backbone', 'threeModel', 'three', 'plist', 'globals'], fu
var nextTab = this.get("lastNavTab")[navSelection] || _.keys(plist.allMenus[navSelection].tabs)[0];
this.set("currentTab", nextTab, {silent:true});
+ if (plist.allMenus[navSelection].parent) navSelection = plist.allMenus[navSelection].parent;
+
if (navSelection == "navDesign") {
this.set("basePlaneIsVisible", true);
this.set("highlighterIsVisible", true);
- } else if (navSelection == "electronicNavSim" || navSelection == "mechanicalNavSim"){
+ } else if (navSelection == "navSim"){
this.set("basePlaneIsVisible", true);
this.set("highlighterIsVisible", false);
} else if (navSelection == "navAssemble"){
--
GitLab