diff --git a/js/menus/NavViewMenu.js b/js/menus/NavViewMenu.js index f1a8b4eba99d3be1ab05829bd5a32b2c48998ded..64383a6713fb2f525b16ed473db562bac9bc71d4 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 48c1613497e48819a9d738b65b99d1c84a2da1b2..b79aa5f2a2299ebc24d5faa170e1adbaf981d111 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>