diff --git a/css/main.css b/css/main.css index ad000aafd186c076859e6401222afc99d08d6d9e..5205f9ee0ede3a4e00ca2944917daf03c6fdd11f 100644 --- a/css/main.css +++ b/css/main.css @@ -285,7 +285,7 @@ input.intInput, input.floatInput{ #navRibbon{ height: 49px; - width: 270px; + width: 400px; z-index: 1; display: block; position: absolute; diff --git a/js/menus/CompositeMenu.js b/js/menus/CompositeMenu.js index dc4b1e13582f82b73ef587e4e08d24166aaac4c5..f724c19e082e81cab4ef80a26151afa427a1d25d 100644 --- a/js/menus/CompositeMenu.js +++ b/js/menus/CompositeMenu.js @@ -33,6 +33,11 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _ _finishComposite: function(e){ e.preventDefault(); this.stopListening(); + if (!lattice.makeNewCompositeMaterial){ + console.warn("lattice not in composite mode for finish composite call"); + this._exit(); + return; + } lattice.makeNewCompositeMaterial($("#compositeName").val()); this._exit(); }, @@ -48,6 +53,11 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _ _deleteComposite: function(e){ e.preventDefault(); + if (!lattice.deleteComposite){ + console.warn("lattice not in composite mode for delete composite call"); + this._exit(); + return; + } lattice.deleteComposite(); this._exit(); }, @@ -57,7 +67,6 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _ }, _makeTemplateJSON: function(){ - console.log("render"); return _.extend(lattice.toJSON()); }, @@ -69,9 +78,9 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _ Display Color: \ <input style="border-color: <%= compositeColor %> ;" value="<%= compositeColor %>" placeholder="Enter HEX" class="halfWidth form-control" type="text"><br/><br/>\ <a id="newRandomColor" href="#" class="btn btn-block btn-lg btn-default">New Random Color</a><br/><br/>\ - <a id="cancelComposite" href="#" class="btn btn-halfWidth btn-lg btn-default">Cancel / Exit</a>\ - <a id="deleteComposite" href="#" class="btn btn-halfWidth pull-right btn-lg btn-default"><span class="fui-trash"></span> Delete</a><br/><br/>\ <a id="finishComposite" href="#" class="btn btn-block btn-lg btn-success">Finish Composite</a><br/>\ + <a id="cancelComposite" href="#" class="btn btn-halfWidth btn-lg btn-default">Cancel / Exit</a>\ + <a id="deleteComposite" href="#" class="btn btn-halfWidth pull-right btn-lg btn-default"><span class="fui-trash"></span> Delete</a><br/>\ ') }); diff --git a/js/menus/MenuParentView.js b/js/menus/MenuParentView.js index d7c0847628a4662252e8f16730037612f769e605..60f97965a31f9f028e51a0ce0c7abe57b9abd7a4 100644 --- a/js/menus/MenuParentView.js +++ b/js/menus/MenuParentView.js @@ -25,9 +25,9 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone){ destroy: function(){ this.stopListening(); -// this.undelegateEvents(); -// this.$el.removeData().unbind(); -// this.remove(); + this.undelegateEvents(); + this.$el.removeData().unbind(); +// this.remove();//todo not convinced I have this right yet // Backbone.View.prototype.remove.call(this); } diff --git a/js/menus/Ribbon.js b/js/menus/Ribbon.js index f11c84c93b774b885d422e56cd4a8fe1cdcc4888..c530aa719d353a85935981f290f598637ed713c2 100644 --- a/js/menus/Ribbon.js +++ b/js/menus/Ribbon.js @@ -61,10 +61,12 @@ define(['jquery', 'underscore', 'backbone', 'plist', 'lattice'], function($, _, template: _.template('\ <div class="btn-toolbar">\ <div class="btn-group">\ + <!--<a data-type="supercell" class="btn btn-primary btn-ribbon ribbonCellMode<% if (cellMode == "supercell"){ %> ribbon-selected<% } %>" href="#">Super</a>-->\ <a data-type="cell" class="btn btn-primary btn-ribbon ribbonCellMode<% if (cellMode == "cell"){ %> ribbon-selected<% } %>" href="#"><img data-type="cell" src="assets/imgs/cell-sm.png"></a>\ <% if (allPartTypes[cellType][connectionType]){ %>\ <a data-type="part" class="btn btn-primary btn-ribbon ribbonCellMode<% if (cellMode == "part"){ %> ribbon-selected<% } %>" href="#"><img data-type="part" src="assets/imgs/part-sm.png"></a>\ <% } %>\ + <!--<a data-type="beam" class="btn btn-primary btn-ribbon ribbonCellMode<% if (cellMode == "beam"){ %> ribbon-selected<% } %>" href="#">Beam</a>-->\ <a class="btn btn-primary btn-ribbon ribbonDeleteMode<% if (deleteMode){ %> ribbon-selected"<% } %>"><span class="fui-cross"></span></a>\ </div>\ </div>\