From 428ee7fceaa0c6b9eb96606da0566dbfa39ddc0e Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 7 Sep 2015 21:19:05 -0400
Subject: [PATCH] units in plist instead of camplist
---
js/menus/CamMenuView.js | 6 +++---
js/plists/CamPList.js | 6 ------
js/plists/PList.js | 6 ++++++
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/js/menus/CamMenuView.js b/js/menus/CamMenuView.js
index 4618023d..e14a6bca 100644
--- a/js/menus/CamMenuView.js
+++ b/js/menus/CamMenuView.js
@@ -2,8 +2,8 @@
* Created by aghassaei on 1/26/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'lattice', 'text!camMenuTemplate'],
- function($, _, MenuParentView, camPlist, cam, lattice, template){
+define(['jquery', 'underscore', 'menuParent', 'camPlist', 'plist', 'cam', 'lattice', 'text!camMenuTemplate'],
+ function($, _, MenuParentView, camPlist, plist, cam, lattice, template){
return MenuParentView.extend({
@@ -36,7 +36,7 @@ define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'lattice', 'tex
},
_makeTemplateJSON: function(){
- var data = _.extend(this.model.toJSON(), cam.toJSON(), camPlist, cam.get("assembler").toJSON(), lattice.toJSON());
+ var data = _.extend(this.model.toJSON(), cam.toJSON(), camPlist, plist, cam.get("assembler").toJSON(), lattice.toJSON());
if (cam.get("stockPositionRelative")){
var relStockPos = {};
relStockPos.x = data.stockPosition.x - data.originPosition.x;
diff --git a/js/plists/CamPList.js b/js/plists/CamPList.js
index b65812bc..5efccb86 100644
--- a/js/plists/CamPList.js
+++ b/js/plists/CamPList.js
@@ -202,12 +202,6 @@ define(['three'], function(THREE){
shopbot: "Shopbot (sbp)",
gcode: "G-Code",
tinyG: "TinyG (G-Code)"
- },
-
- allUnitTypes: {
- inches: "Inches",
- mm: "mm",
- um: "Micron"
}
}
diff --git a/js/plists/PList.js b/js/plists/PList.js
index 8778ec64..bdbfd5f1 100644
--- a/js/plists/PList.js
+++ b/js/plists/PList.js
@@ -370,6 +370,12 @@ define(['three'], function(THREE){
allScripts: {
loadFile: "Load From File..."
+ },
+
+ allUnitTypes: {
+ inches: "Inches",
+ mm: "mm",
+ um: "Micron"
}
}
--
GitLab