From 00f618bbcfc03af4dedfd74e2199ed64a33b09a5 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 15 Sep 2015 00:07:14 -0400
Subject: [PATCH] sim won't crash
---
js/main.js | 1 +
js/menus/DNASimSetupMenuView.js | 25 +++++++++++++++++++++
js/menus/templates/DNASimSetupMenuView.html | 1 +
js/models/AppState.js | 2 +-
js/plists/PList.js | 13 ++++++++---
5 files changed, 38 insertions(+), 4 deletions(-)
create mode 100644 js/menus/DNASimSetupMenuView.js
create mode 100644 js/menus/templates/DNASimSetupMenuView.html
diff --git a/js/main.js b/js/main.js
index 3b66cf24..e46558a6 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 00000000..a38bd21a
--- /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 00000000..d0493a7e
--- /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 355a88ad..1d4112ce 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 1e4a9bd6..31bed90a 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:{}
}
},
--
GitLab