diff --git a/js/menus/Navbar.js b/js/menus/Navbar.js index ee61f7e77d2a825ad8af8eeb4416b608cba06f8f..1a3e37d68da919de2e398d211dcf076aab7f28e7 100644 --- a/js/menus/Navbar.js +++ b/js/menus/Navbar.js @@ -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); }, diff --git a/js/worker.js b/js/worker.js index d95e8a957cd1697fb3ff96f460b5c589075f3f24..89c49166e3783475bfd12c75eb47f1f0925f7020 100644 --- a/js/worker.js +++ b/js/worker.js @@ -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){ diff --git a/main.html b/main.html index b694e82a84f811641c7d9c302570e6839a5c1ef1..0e48077ca88080b0c027228a8b92f514372be240 100644 --- a/main.html +++ b/main.html @@ -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>