From 42a715a024823612ba9289178bcbd8279a05b061 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 8 Sep 2015 15:26:26 -0400
Subject: [PATCH] view menu fixes
---
js/menus/NavViewMenu.js | 10 ++++++----
js/menus/templates/NavViewMenu.html | 3 ++-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/js/menus/NavViewMenu.js b/js/menus/NavViewMenu.js
index f1a8b4eb..64383a67 100644
--- a/js/menus/NavViewMenu.js
+++ b/js/menus/NavViewMenu.js
@@ -3,15 +3,16 @@
*/
-define(['jquery', 'underscore', 'backbone', 'plist', 'text!navViewMenuTemplate'], function($, _, Backbone, plist, template){
+define(['jquery', 'underscore', 'backbone', 'plist', 'lattice', 'text!navViewMenuTemplate'],
+ function($, _, Backbone, plist, lattice, template){
return Backbone.View.extend({
el: "#navViewMenu",
events: {
- "click a.boolProperty": "_makeSelection",
- "click #reset3DView": "_reset3DNavigation"
+ "click a": "_makeSelection",
+ "click #reset3DView": "_reset3DNavigation"
},
initialize: function(){
@@ -20,6 +21,7 @@ define(['jquery', 'underscore', 'backbone', 'plist', 'text!navViewMenuTemplate']
},
+
_makeSelection: function(e){
e.preventDefault();
var $target = $(e.target);
@@ -46,7 +48,7 @@ define(['jquery', 'underscore', 'backbone', 'plist', 'text!navViewMenuTemplate']
},
render: function(){
- this.$el.html(this.template(_.extend(this.model.toJSON(), plist)));
+ this.$el.html(this.template(_.extend(this.model.toJSON(), plist, lattice.toJSON())));
var self = this;
_.each($(".boolProperty"), function(item){
diff --git a/js/menus/templates/NavViewMenu.html b/js/menus/templates/NavViewMenu.html
index 48c16134..b79aa5f2 100644
--- a/js/menus/templates/NavViewMenu.html
+++ b/js/menus/templates/NavViewMenu.html
@@ -28,7 +28,8 @@
<li class="dropdown-submenu">
<a tabindex="-1">Cells<span class="pull-right fui-arrow-right"></span></a>
<ul class="dropdown-menu">
- <% _.each(allCellModes, function(mode, key){ %>
+ <% _.each(allCellModes, function(mode, key){
+ if (key == "part" && allLattices[cellType].connection[connectionType].type[latticeType].parts === null) return; %>
<li><a class="appState" data-property="cellMode" data-value="<%= key %>" href="#"><% if (cellMode == key) { %><span class="fui-check"></span><% } %><%= mode %></a></li>
<% }); %>
</ul>
--
GitLab