diff --git a/js/menus/AnimationMenuView.js b/js/menus/AnimationMenuView.js index e76d4fb76a2aad6e861d652b55a024bc2e80bf06..d618161d53b2d6404906b13addaf20763c47970b 100644 --- a/js/menus/AnimationMenuView.js +++ b/js/menus/AnimationMenuView.js @@ -126,7 +126,7 @@ AnimationMenuView = Backbone.View.extend({ <div id="postWarning">You have made the following changes that require post processing:<br/>\ This will override edits you have made to the G-code. OK to override? <a href="#" class="overrideEdits btn btn-block btn-lg btn-danger">OK</a></div>\ <% } %>\ - <div id="gcodeEditor" contenteditable><%= dataOut %></div><br/>\ + <div id="gcodeEditor"><%= dataOut %></div><br/>\ <a href="#" class="overrideEdits btn btn-block btn-lg btn-default">Undo Changes</a><br/>\ ') diff --git a/js/models/AppState.js b/js/models/AppState.js index daebfb5a20c85827bd4c40bc91f4660fcb881b64..ca835c4c15962d28b67b4c2ea297aec2249fef14 100644 --- a/js/models/AppState.js +++ b/js/models/AppState.js @@ -236,9 +236,12 @@ AppState = Backbone.Model.extend({ this.downKeys[e.keyCode] = true; } else this.downKeys[e.keyCode] = false; -// console.log(e); -// console.log(e.keyCode); +// consog(e); +// console.log(e.keyCode);le.lo switch(e.keyCode){ + case 8://delete key - causes back nav in chrome, super annoying + e.preventDefault(); + e.stopPropagation(); case 16://shift this.set("shift", state); break;