From b49383189189cfb274d1f497e97b6ea48728e251 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 24 Mar 2015 21:56:32 -0400
Subject: [PATCH] small changes
---
js/menus/Ribbon.js | 4 ++--
js/models/AppState.js | 2 +-
js/models/Lattice.js | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/js/menus/Ribbon.js b/js/menus/Ribbon.js
index 7a345362..9ab8d7a6 100644
--- a/js/menus/Ribbon.js
+++ b/js/menus/Ribbon.js
@@ -31,8 +31,8 @@ Ribbon = Backbone.View.extend({
template: _.template('\
<div class="btn-toolbar">\
<div class="btn-group">\
- <a class="btn btn-primary btn-ribbon cellModeBtn<% if (cellMode == "cell"){ %> ribbon-selected"<% } %> href="#"><img data-type="cell" src="assets/cell-sm.png"></a>\
- <a class="btn btn-primary btn-ribbon cellModeBtn<% if (cellMode == "part"){ %> ribbon-selected"<% } %> href="#"><img data-type="part" src="assets/part-sm.png"></a>\
+ <a data-type="cell" class="btn btn-primary btn-ribbon cellModeBtn<% if (cellMode == "cell"){ %> ribbon-selected"<% } %> href="#"><img data-type="cell" src="assets/cell-sm.png"></a>\
+ <a data-type="part" class="btn btn-primary btn-ribbon cellModeBtn<% if (cellMode == "part"){ %> ribbon-selected"<% } %> href="#"><img data-type="part" src="assets/part-sm.png"></a>\
</div>\
</div>\
')
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 373c24ee..443f8576 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -300,7 +300,7 @@ AppState = Backbone.Model.extend({
loadLatticeFromJSON: function(data){
dmaGlobals.lattice.clearCells();
- this._setData(JSON.parse(data), true);
+ this._setData(JSON.parse(data), false);
dmaGlobals.lattice._updateLatticeType(null, null, null, true);
dmaGlobals.lattice.trigger("change:scale");//todo make this better
},
diff --git a/js/models/Lattice.js b/js/models/Lattice.js
index 5dee5b0d..c5e1abe7 100644
--- a/js/models/Lattice.js
+++ b/js/models/Lattice.js
@@ -340,7 +340,7 @@ Lattice = Backbone.Model.extend({
var cellMode = dmaGlobals.appState.get("cellMode");
var partType = this.get("partType");
this._iterCells(this.get("cells"), function(cell){
- if (cell) cell.updateForScale(scale, cellMode, partType);
+ if (cell && cell.updateForScale) cell.updateForScale(scale, cellMode, partType);
});
dmaGlobals.three.render();
--
GitLab