From 50d00a14b428792be7bf216a3a9180d68e1e902d Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 25 Mar 2015 12:48:08 -0400
Subject: [PATCH] small changes
---
js/cam/MachineOneBit.js | 3 ---
js/menus/Ribbon.js | 5 ++++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/js/cam/MachineOneBit.js b/js/cam/MachineOneBit.js
index 05edf617..8964b1a2 100644
--- a/js/cam/MachineOneBit.js
+++ b/js/cam/MachineOneBit.js
@@ -76,9 +76,6 @@ OneBitBot.prototype._moveTo = function(x, y, z, speed, wcs, callback){
if (totalThreads > 0) return;
callback();
}
- x += this.position.x;
- y += this.position.y;
- z += this.position.z;
var startingPos = this.meshes["zAxis"].position.clone();
speed = this._normalizeSpeed(startingPos, x, y, this._reorganizeSpeed(speed));
this._moveXAxis(startingPos.x, x, "x", speed.x, sketchyCallback);
diff --git a/js/menus/Ribbon.js b/js/menus/Ribbon.js
index d74ccd30..e0979ccd 100644
--- a/js/menus/Ribbon.js
+++ b/js/menus/Ribbon.js
@@ -18,6 +18,7 @@ Ribbon = Backbone.View.extend({
this.listenTo(this.model, "change:cellMode", this.render);
this.listenTo(this.model, "change:deleteMode", this.render);
+ this.listenTo(dmaGlobals.lattice, "change:cellType change:connectionType", this.render);
this.render();
},
@@ -32,14 +33,16 @@ Ribbon = Backbone.View.extend({
},
render: function(){
- this.$el.html(this.template(this.model.toJSON()));
+ this.$el.html(this.template(_.extend(dmaGlobals.lattice.toJSON(), this.model.toJSON())));
},
template: _.template('\
<div class="btn-toolbar">\
<div class="btn-group">\
<a data-type="cell" class="btn btn-primary btn-ribbon cellModeBtn<% 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 cellModeBtn<% if (cellMode == "part"){ %> ribbon-selected<% } %>" href="#"><img data-type="part" src="assets/imgs/part-sm.png"></a>\
+ <% } %>\
<a class="btn btn-primary btn-ribbon deleteMode<% if (deleteMode){ %> ribbon-selected"<% } %>"><span class="fui-cross"></span></a>\
</div>\
</div>\
--
GitLab