From 0ef84b3db6824ad260bac5b93ecc1d9ac1ea8bd2 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 9 Mar 2015 16:21:08 -0400
Subject: [PATCH] kelvin menus, no implementation yet
---
js/models/AppState.js | 8 ++++++--
js/models/Lattice.js | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 7ceb20d1..7141ef85 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -18,10 +18,11 @@ AppState = Backbone.Model.extend({
menuWrapper: null,
- allCellTypes: {octa:"Octahedron", cube:"Cube"},
+ allCellTypes: {octa:"Octahedron", cube:"Cube", kelvin:"Kelvin"},
allConnectionTypes: {
octa: {face:"Face", freeformFace:"Freeform Face", edge:"Edge", edgeRot:"Rotated Edge", vertex:"Vertex"},
- cube: {face:"Face"}
+ cube: {face:"Face"},
+ kelvin: {face: "Face"}
},
allPartTypes:{
octa:{
@@ -33,6 +34,9 @@ AppState = Backbone.Model.extend({
},
cube:{
face: {beam:"Beam"}
+ },
+ kelvin:{
+ face: {beam:"Beam"}
}
},
diff --git a/js/models/Lattice.js b/js/models/Lattice.js
index c3dd52ed..4795554d 100644
--- a/js/models/Lattice.js
+++ b/js/models/Lattice.js
@@ -393,6 +393,8 @@ Lattice = Backbone.Model.extend({
}
} else if (cellType == "cube"){
_.extend(this, this.CubeLattice);
+ } else if (cellType == "kelvin"){
+ _.extend(this, this.CubeLattice);
}
this._initLatticeType();
--
GitLab