Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Amanda Ghassaei
DMDesign
Commits
00f618bb
Commit
00f618bb
authored
Sep 15, 2015
by
Amanda Ghassaei
Browse files
sim won't crash
parent
9a17158e
Changes
5
Hide whitespace changes
Inline
Side-by-side
js/main.js
View file @
00f618bb
...
...
@@ -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
'
,
...
...
js/menus/DNASimSetupMenuView.js
0 → 100644
View file @
00f618bb
/**
* 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
js/menus/templates/DNASimSetupMenuView.html
0 → 100644
View file @
00f618bb
nothing here yet
\ No newline at end of file
js/models/AppState.js
View file @
00f618bb
...
...
@@ -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
();
...
...
js/plists/PList.js
View file @
00f618bb
...
...
@@ -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
:
"
H
exagonal
"
,
name
:
"
H
oneycomb
"
,
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
:{}
}
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment