Skip to content
Snippets Groups Projects
Commit ad24f8d8 authored by amandaghassaei's avatar amandaghassaei
Browse files

about link

parent f1d72a14
No related branches found
No related tags found
No related merge requests found
......@@ -54,12 +54,12 @@ NavBar = Backbone.View.extend({
},
_setNavSelection: function(e){
e.preventDefault();
var navSelection = $(e.target).data("menuId");
if (navSelection == "about") {
$(e.target).blur();
return;
}
e.preventDefault();
if (navSelection) this.model.set("currentNav", navSelection);
},
......
......@@ -5,10 +5,10 @@
function myWorker(){
//local variables
localEnv = null;//local variables passed in from outside
working = false;//boolean that says whether I'm busy or not
arg = null;//main data we are crunching
modelMesh = null;//hold on to this so we don't have to keep passing it in
var localEnv = null;//local variables passed in from outside
var working = false;//boolean that says whether I'm busy or not
var arg = null;//main data we are crunching
var modelMesh = null;//hold on to this so we don't have to keep passing it in
self.onmessage = function(e) {
var data = e.data;
......@@ -20,13 +20,13 @@ function myWorker(){
url = url.substring(0, index);
}
//load all scripts
importScripts(url + 'dependencies/three.js');
// importScripts(url + 'dependencies/three.js');
// importScripts(url + 'js/models/dmaBeam.js');
}
//
if (data.model){
var material = new THREE.MeshBasicMaterial({side:THREE.DoubleSide});
modelMesh = new THREE.Mesh(JSON.parse(data.model), material);
//var material = new THREE.MeshBasicMaterial({side:THREE.DoubleSide});
//modelMesh = new THREE.Mesh(JSON.parse(data.model), material);
}
if (data.executable){
......
......@@ -122,7 +122,7 @@
<li><a id="exportSTL" href="#">Export STL</a></li>
</ul>
</li>
<li><a data-menu-id="about" class="menuHoverControls" href="#">About</a></li>
<li><a data-menu-id="about" class="menuHoverControls" target="_blank" href="http://dma.cba.mit.edu/">About</a></li>
</ul>
<ul class="nav navbar-nav pull-right">
<li><a id="showHideMenu" href="#">Hide Menu >></a></li>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment