From 70210adcbb58eaaeddaeebe7c74f5d3b118365c5 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 12 Aug 2015 00:23:32 -0400
Subject: [PATCH] adding edit component menu
---
js/main.js | 2 ++
js/menus/AssemblerSetupMenuView.js | 6 ++++
js/menus/EditComponentMenuView.js | 30 +++++++++++++++++++
.../templates/AssemblerSetupMenuView.html | 6 +++-
js/menus/templates/EditComponentMenuView.html | 2 ++
js/plists/PList.js | 3 ++
6 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 js/menus/EditComponentMenuView.js
create mode 100644 js/menus/templates/EditComponentMenuView.html
diff --git a/js/main.js b/js/main.js
index d9dc5cc3..5b27c471 100644
--- a/js/main.js
+++ b/js/main.js
@@ -128,6 +128,7 @@ require.config({
mStaticMenu: 'menus/MStaticMenuView',
mDynamicMenu: 'menus/MDynamicMenuView',
assemblerSetupMenu: 'menus/AssemblerSetupMenuView',
+ editComponentMenu: 'menus/EditComponentMenuView',
//templates
navViewMenuTemplate: 'menus/templates/NavViewMenu.html',
@@ -156,6 +157,7 @@ require.config({
mStaticMenuTemplate: 'menus/templates/MStaticMenuView.html',
mDynamicMenuTemplate: 'menus/templates/MDynamicMenuView.html',
assemblerSetupMenuTemplate: 'menus/templates/AssemblerSetupMenuView.html',
+ editComponentMenuTemplate: 'menus/templates/EditComponentMenuView.html',
//electronic sim
eSimPlist: 'plists/ESimPlist',
diff --git a/js/menus/AssemblerSetupMenuView.js b/js/menus/AssemblerSetupMenuView.js
index 3d5028f4..903a2a13 100644
--- a/js/menus/AssemblerSetupMenuView.js
+++ b/js/menus/AssemblerSetupMenuView.js
@@ -9,12 +9,18 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'text!assemblerSet
return MenuParentView.extend({
events: {
+ "click .editMachineComponent": "_editMachineComponent"
},
_initialize: function(){
},
+ _editMachineComponent: function(e){
+ e.preventDefault();
+ this.model.set("currentNav", "navMachineComponent");
+ },
+
_makeTemplateJSON: function(){
return _.extend(this.model.toJSON(), cam.toJSON());
},
diff --git a/js/menus/EditComponentMenuView.js b/js/menus/EditComponentMenuView.js
new file mode 100644
index 00000000..474d2501
--- /dev/null
+++ b/js/menus/EditComponentMenuView.js
@@ -0,0 +1,30 @@
+/**
+ * Created by aghassaei on 8/12/15.
+ */
+
+
+define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'text!editComponentMenuTemplate'],
+ function($, _, MenuParentView, plist, cam, template){
+
+ return MenuParentView.extend({
+
+ events: {
+ "click #exitComponentEdit": "_exit"
+ },
+
+ _initialize: function(){
+
+ },
+
+ _exit: function(e){
+ e.preventDefault();
+ this.model.set("currentNav", "navAssemble");
+ },
+
+ _makeTemplateJSON: function(){
+ return _.extend(this.model.toJSON(), cam.toJSON());
+ },
+
+ template: _.template(template)
+ });
+});
\ No newline at end of file
diff --git a/js/menus/templates/AssemblerSetupMenuView.html b/js/menus/templates/AssemblerSetupMenuView.html
index 939d97ef..027c26d8 100644
--- a/js/menus/templates/AssemblerSetupMenuView.html
+++ b/js/menus/templates/AssemblerSetupMenuView.html
@@ -1 +1,5 @@
-Assembler Setup
\ No newline at end of file
+Parent/Child Tree:<br/><br/>
+Component 1 <a class="editMachineComponent" href="#">Edit</a><br/><br/>
+<a href="#" id="newMachineComponent" class=" btn btn-block btn-lg btn-default">+ New Machine Component</a><br/>
+Edit Code:<br/><br/>
+<a href="#" id="saveMachineToFiles" class=" btn btn-block btn-lg btn-success">Save Machine Files</a><br/>
diff --git a/js/menus/templates/EditComponentMenuView.html b/js/menus/templates/EditComponentMenuView.html
new file mode 100644
index 00000000..0caececa
--- /dev/null
+++ b/js/menus/templates/EditComponentMenuView.html
@@ -0,0 +1,2 @@
+<a href="#" id="exitComponentEdit" class=" btn btn-block btn-lg btn-default">Cancel / Exit</a><br/>
+
diff --git a/js/plists/PList.js b/js/plists/PList.js
index 08828855..ebc047bb 100644
--- a/js/plists/PList.js
+++ b/js/plists/PList.js
@@ -36,6 +36,9 @@ define(['three'], function(THREE){
// editCamOutput: "Edit",
animate:"Preview"
},
+ navMachineComponent:{
+ editComponent: "Edit Component"
+ },
navComm:{
setupComm: "Setup",
send: "Send"
--
GitLab