From f0ed7b2157e9a0dc8a2d365d0f9a08848d79d43b Mon Sep 17 00:00:00 2001 From: Amanda Ghassaei <amandaghassaei@gmail.com> Date: Thu, 11 Jun 2015 10:41:29 -0700 Subject: [PATCH] save composite name --- css/main.css | 5 +++++ js/menus/CompositeMenu.js | 2 +- js/menus/MenuWrapperView.js | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/css/main.css b/css/main.css index 5205f9ee..9cac23ac 100644 --- a/css/main.css +++ b/css/main.css @@ -283,6 +283,11 @@ input.intInput, input.floatInput{ display: inline-block; } +.seventyFiveWidth{ + width: 75%; + display: inline-block; +} + #navRibbon{ height: 49px; width: 400px; diff --git a/js/menus/CompositeMenu.js b/js/menus/CompositeMenu.js index f724c19e..2086b8f5 100644 --- a/js/menus/CompositeMenu.js +++ b/js/menus/CompositeMenu.js @@ -73,7 +73,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _ 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 id="compositeName" value="<%= compositeName %>" placeholder="Enter Name" class="halfWidth form-control" type="text"><br/><br/>\ + Name: <input id="compositeName" data-property="compositeName" value="<%= compositeName %>" placeholder="Enter Name" class="seventyFiveWidth form-control textInput lattice" type="text"><br/><br/>\ Bounding Box: ()<br/><br/>\ Display Color: \ <input style="border-color: <%= compositeColor %> ;" value="<%= compositeColor %>" placeholder="Enter HEX" class="halfWidth form-control" type="text"><br/><br/>\ diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js index 76ff4bbe..82d3b82e 100644 --- a/js/menus/MenuWrapperView.js +++ b/js/menus/MenuWrapperView.js @@ -44,6 +44,18 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice'], function($, _, } if ($(".floatInput").is(":focus")) this._updateFloat(e); if ($(".intInput").is(":focus")) this._updateInt(e); + if ($(".textInput").is(":focus")) this._updateString(e); + }, + + _updateString: function(e){ + e.preventDefault(); + var $target = $(e.target); + var property = $target.data("property"); + if (!property) { + console.warn("no property associated with string input"); + return; + } + this._getPropertyOwner($target).set(property, $target.val()); }, _updateFloat: function(e){ -- GitLab