Skip to content
Snippets Groups Projects
Commit a916e0c3 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

annoying delete key thing in chrome fixed

parent 002a80cc
No related branches found
No related tags found
No related merge requests found
...@@ -126,7 +126,7 @@ AnimationMenuView = Backbone.View.extend({ ...@@ -126,7 +126,7 @@ AnimationMenuView = Backbone.View.extend({
<div id="postWarning">You have made the following changes that require post processing:<br/>\ <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>\ 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/>\ <a href="#" class="overrideEdits btn btn-block btn-lg btn-default">Undo Changes</a><br/>\
') ')
......
...@@ -236,9 +236,12 @@ AppState = Backbone.Model.extend({ ...@@ -236,9 +236,12 @@ AppState = Backbone.Model.extend({
this.downKeys[e.keyCode] = true; this.downKeys[e.keyCode] = true;
} else this.downKeys[e.keyCode] = false; } else this.downKeys[e.keyCode] = false;
// console.log(e); // consog(e);
// console.log(e.keyCode); // console.log(e.keyCode);le.lo
switch(e.keyCode){ switch(e.keyCode){
case 8://delete key - causes back nav in chrome, super annoying
e.preventDefault();
e.stopPropagation();
case 16://shift case 16://shift
this.set("shift", state); this.set("shift", state);
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment