diff --git a/js/main.js b/js/main.js index 3b66cf24ac5e206bd10cdec83cc5fab41315a620..e46558a6c0899544291f368834ff95be5cc07fdc 100644 --- a/js/main.js +++ b/js/main.js @@ -144,6 +144,7 @@ require.config({ mSetupMenu: 'menus/MSetupMenuView', mStaticMenu: 'menus/MStaticMenuView', mDynamicMenu: 'menus/MDynamicMenuView', + dnaSetupMenu: 'menus/DNASimSetupMenuView', assemblerSetupMenu: 'menus/AssemblerSetupMenuView', editComponentMenu: 'menus/EditComponentMenuView', commParentMenu: 'menus/CommParentMenu', diff --git a/js/menus/DNASimSetupMenuView.js b/js/menus/DNASimSetupMenuView.js new file mode 100644 index 0000000000000000000000000000000000000000..a38bd21a9af39a3e89907d78d8b9695a8d750844 --- /dev/null +++ b/js/menus/DNASimSetupMenuView.js @@ -0,0 +1,25 @@ +/** + * Created by aghassaei on 9/14/15. + */ + + +define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!menus/templates/DNASimSetupMenuView.html'], + function($, _, MenuParentView, plist, lattice, template){ + + + return MenuParentView.extend({ + + events: { + }, + + + _initialize: function(){ + }, + + _makeTemplateJSON: function(){ + return {}; + }, + + template: _.template(template) + }); +}); \ No newline at end of file diff --git a/js/menus/templates/DNASimSetupMenuView.html b/js/menus/templates/DNASimSetupMenuView.html new file mode 100644 index 0000000000000000000000000000000000000000..d0493a7ebe757dad1a21fce07568bf34ad928f28 --- /dev/null +++ b/js/menus/templates/DNASimSetupMenuView.html @@ -0,0 +1 @@ +nothing here yet \ No newline at end of file diff --git a/js/models/AppState.js b/js/models/AppState.js index 355a88ad98ff9fcafb578e42ad4349d537d7e174..1d4112ce2733d14d7de8b37db24c0285782dd601 100644 --- a/js/models/AppState.js +++ b/js/models/AppState.js @@ -199,7 +199,7 @@ define(['underscore', 'backbone', 'threeModel', 'three', 'plist', 'globals'], fu } else this.downKeys[e.keyCode] = false; // console.log(e); - console.log(e.keyCode); +// console.log(e.keyCode); switch(e.keyCode){ case 8://delete key - causes back nav in chrome, super annoying e.preventDefault(); diff --git a/js/plists/PList.js b/js/plists/PList.js index 1e4a9bd67b8580e61b0b56167ccaf79813b3ea5c..31bed90a813b2aa43ad2471be239ce882ee155b8 100644 --- a/js/plists/PList.js +++ b/js/plists/PList.js @@ -46,6 +46,13 @@ define(['three'], function(THREE){ eDynamic:"Dynamics" } }, + dnaNavSim:{ + name: "DNA Simulation", + parent: "navSim", + tabs:{ + dnaSetup: "Setup" + } + }, mechanicalNavSim:{ name: "Mechanical Simulation", parent: "navSim", @@ -315,7 +322,7 @@ define(['three'], function(THREE){ } }, hex: { - name: "Hexagonal", + name: "Honeycomb", connection: { face: { name: "Face", @@ -368,13 +375,13 @@ define(['three'], function(THREE){ tension:{ name: "Tension", color: "#aaa", - altColor: "#666", + altColor: "#70eee8", properties:{} }, compression: { name: "Compression", color: "#aaa", - altColor: "#8391AC", + altColor: "#f0c437", properties:{} } },