added delete + backspace to remove selection hotkey list and prevent …

…default so browser doesn't navigate back

app/actions.js

@@ -156,7 +156,8 @@ export function deleteCaption(captionId) {
   return { type: DELETE_CAPTION, captionId };
 }
 
-export function deleteSelection(selection) {
+export function deleteSelection(event, selection) {
+  event.preventDefault();
   return { type: DELETE_SELECTION, selection };
 }
 

app/components/Root.jsx

@@ -62,7 +62,7 @@ class Root extends Component {
       'resetZoom': 'ctrl+0',
       'shiftDown': { sequence: 'shift', action: 'keydown' },
       'shiftUp': { sequence: 'shift', action: 'keyup' },
-      'delete': ['alt+d', 'ctrl+d', 'command+d']
+      'delete': ['alt+d', 'ctrl+d', 'command+d', 'del', 'backspace']
     };
 
     const keyHandlers = {
@@ -73,7 +73,7 @@ class Root extends Component {
       'resetZoom': () => dispatch(resetZoom()),
       'shiftDown': () => this.setState({ shiftKey: true }),
       'shiftUp': () => this.setState({ shiftKey: false }),
-      'delete': () => dispatch(deleteSelection(selection))
+      'delete': (event) => dispatch(deleteSelection(event, selection))
     };
 
     let graphApi = {

app/components/__tests__/Edge-test.jsx

@@ -72,4 +72,14 @@ describe("Edge Component", () => {
     TestUtils.Simulate.click(select);
     expect(clickEdge.mock.calls[0][0]).toBe(data.id);
   });
+
+  it("should be removed when delete hotkey is pressed", () => {
+    let deleteEdge = jest.genMockFunction();
+    let edge = TestUtils.renderIntoDocument(
+      <Edge edge={data} graphId="someid" clickEdge={deleteEdge} />
+    );
+    let element = ReactDOM.findDOMNode(edge);
+    TestUtils.Simulate.keyDown(element, {key: "Delete", keyCode: 46, which: 46});
+    expect(deleteEdge.mock.calls[0]).toBeUndefined();
+  });
 });

app/components/__tests__/Node-test.jsx

@@ -9,6 +9,8 @@ import { shallow } from "enzyme";
 import Node from '../Node';
 import NodeCircle from "../NodeCircle";
 import NodeLabel from "../NodeLabel";
+import TestUtils from 'react-addons-test-utils';
+
 
 describe("Node Component", () => {
 
@@ -79,4 +81,14 @@ describe("Node Component", () => {
 
     expect(moveNode.mock.calls.length).toBe(1);
   });
+
+  it("should be removed when delete hotkey is pressed", () => {
+    let deleteNode = jest.genMockFunction();
+    let wrapper = shallow(
+      <Node node={data} graph={{id: "someid"}} clickNode={deleteNode} />
+    );
+    let element = wrapper.find("g.node");
+    TestUtils.Simulate.keyDown(element, {key: "Delete", keyCode: 46, which: 46});
+    expect(deleteNode.mock.calls[0]).toBeUndefined();
+  });
 });

app/main.jsx

@@ -201,8 +201,8 @@ class Oligrapher {
     this.root.dispatchProps.dispatch(deselectAll());
   }
 
-  deleteSelection() {
-    this.root.dispatchProps.dispatch(deleteSelection(this.getSelection()));
+  deleteSelection(event) {
+    this.root.dispatchProps.dispatch(deleteSelection(event, this.getSelection()));
   }
 
   updateNode(nodeId, data) {