From a916e0c37e4bdf41ad1ab5c8bd1a5223a5463b8f Mon Sep 17 00:00:00 2001 From: Amanda Ghassaei <amandaghassaei@gmail.com> Date: Wed, 1 Apr 2015 00:19:01 -0400 Subject: [PATCH] annoying delete key thing in chrome fixed --- js/menus/AnimationMenuView.js | 2 +- js/models/AppState.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/js/menus/AnimationMenuView.js b/js/menus/AnimationMenuView.js index e76d4fb7..d618161d 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 daebfb5a..ca835c4c 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; -- GitLab