From afea18ec5e5ce3f430516db807446d97dc1aaab0 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 10 Jun 2015 17:16:27 -0700
Subject: [PATCH] working on composite menu
---
js/menus/CompositeMenu.js | 20 ++++++++++++++++++--
js/models/PList.js | 2 +-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/js/menus/CompositeMenu.js b/js/menus/CompositeMenu.js
index 8ab79c59..2b6903f3 100644
--- a/js/menus/CompositeMenu.js
+++ b/js/menus/CompositeMenu.js
@@ -7,7 +7,9 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _
return MenuParentView.extend({
events: {
- "click #newRandomColor": "_changeRandomColor"
+ "click #newRandomColor": "_changeRandomColor",
+ "click #finishComposite": "_finishComposite",
+ "click #saveComposite": "_saveComposite"
},
_initialize: function(){
@@ -33,17 +35,31 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _
return '#' + Math.floor(Math.random()*16777215).toString(16);
},
+ _finishComposite: function(e){
+ e.preventDefault();
+
+ },
+
+ _saveComposite: function(e){
+ e.preventDefault();
+
+ },
+
_makeTemplateJSON: function(){
return _.extend(this.material);
},
template: _.template('\
+ <a href="#" class="btn btn-halfWidth btn-lg btn-default importJSON">Load Composite</a>\
+ <a id="saveComposite" href="#" class="btn btn-halfWidth btn-lg pull-right btn-default">Save Composite</a><br/><br/>\
Name: <input value="" placeholder="Enter Name" class="halfWidth form-control" type="text"><br/><br/>\
Bounding Box: ()<br/><br/>\
Display Color:<br/>\
<div style="background-color: <%= color %> ;" id="compositeDisplayColor"></div>\
<input value="<%= color %>" placeholder="Enter HEX" class="halfWidth form-control" type="text"><br/>\
- <a id="newRandomColor" href="#" class="btn btn-block btn-lg btn-default">New Random Color</a><br/>\
+ <a id="newRandomColor" href="#" class="btn btn-block btn-lg btn-default">New Random Color</a><br/><br/>\
+ <a id="finishComposite" href="#" class="btn btn-block btn-lg btn-success">Finish Composite</a><br/>\
+ \
')
});
diff --git a/js/models/PList.js b/js/models/PList.js
index 7e740684..680bbeb3 100644
--- a/js/models/PList.js
+++ b/js/models/PList.js
@@ -26,7 +26,7 @@ define(['three'], function(THREE){
send: "Send"
},
navComposite:{
- composite:"Composite"
+ composite:"Composite Editor"
}
},
--
GitLab