From d2a83bf99f2090fd65c92383d155022804cf78ba Mon Sep 17 00:00:00 2001 From: Amanda Ghassaei <amandaghassaei@gmail.com> Date: Mon, 7 Sep 2015 21:45:57 -0400 Subject: [PATCH] naming --- js/menus/templates/LatticeMenuView.html | 2 +- js/plists/PList.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/menus/templates/LatticeMenuView.html b/js/menus/templates/LatticeMenuView.html index 6e218f2a..6d450b19 100644 --- a/js/menus/templates/LatticeMenuView.html +++ b/js/menus/templates/LatticeMenuView.html @@ -30,7 +30,7 @@ Aspect Ratio: <input data-property="aspectRatio" data-key="y" value="<%= aspectRatio.y %>" placeholder="Y" class="form-control floatInput" type="text"> <input data-property="aspectRatio" data-key="z" value="<%= aspectRatio.z %>" placeholder="Z" class="form-control floatInput" type="text"><br/><br/> <% if (connectionType == "gik") { %> - GIK Length: <input data-property="gikLength" value="<%= gikLength %>" placeholder="GIK length" class="form-control intInput appState" type="text"><br/><br/> + Part Length: <input data-property="gikLength" value="<%= gikLength %>" placeholder="Length" class="form-control intInput appState" type="text"><br/><br/> <% } %> <a href="#" class="clearCells btn btn-block btn-lg btn-danger">Clear All Cells</a><br/> Num Cells: <%= numCells %><br/> diff --git a/js/plists/PList.js b/js/plists/PList.js index bdbfd5f1..96502317 100644 --- a/js/plists/PList.js +++ b/js/plists/PList.js @@ -202,11 +202,11 @@ define(['three'], function(THREE){ } }, gik: { - name: "GIK", + name: "Lego", subclass: "gikLattice", type: { willGik: { - name: "Will's Lattice", + name: "Electronic GIK Lattice", parts: { lego: { name: "Micro LEGO (high res)" -- GitLab