Skip to content
Snippets Groups Projects
Commit 97df6666 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

parts removed when needed

parent 3c9de402
No related branches found
No related tags found
No related merge requests found
......@@ -147,6 +147,9 @@
DMACell.prototype.remove = function(){
if (this.cellMesh) window.three.sceneRemove(this.cellMesh);
_.each(this.parts, function(part){
part.remove();
});
};
DMACell.prototype._destroy = function(){
......
......@@ -91,6 +91,10 @@
if (this.mesh) this.mesh.visible = false;
};
DMAPart.prototype.remove = function(){
if (this.mesh) window.three.sceneRemove(this.mesh);
};
DMAPart.prototype._destroy = function(){
this.parentCell = null;
};
......
......@@ -38,7 +38,7 @@ LatticeMenuView = Backbone.View.extend({
},
_formatData: function(){
var formattedCellType = "Octagon";
var formattedCellType = "Octahedral";
var formattedConnectionType = "Face-Connected";
return {formattedCellType:formattedCellType, formattedConnectionType:formattedConnectionType};
},
......
......@@ -75,9 +75,6 @@
<nav class="navbar navbar-inverse navbar-embossed" role="navigation">
<div class="navbar-header">
<!--<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-01">-->
<!--<span class="sr-only">Toggle navigation</span>-->
<!--</button>-->
<a id="mainNavLink" class="navbar-brand" href="http://cba.mit.edu"><img id="logo" src="assets/logo.png"></a>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-01">
......@@ -96,11 +93,12 @@
</li>
<li><a data-menu-id="about" class="menuHoverControls" href="#">About</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<ul class="nav navbar-nav pull-right">
<li><a id="showHideMenu" data-state=true class="menuHoverControls" href="#">Hide Menu >></a></li>
</ul>
<!--<a href="#fakelink" id="clearAll" class=" btn btn-lg btn-primary">Clear All</a>-->
</div><!-- /.navbar-collapse -->
</nav>
<div id="menuWrapper">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment