chore(keyboard): coding style

lib/features/keyboard/Keyboard.js

@@ -12,8 +12,7 @@ import {
   isCmd,
   isKey,
   isShift
-} from './helpers';
-
+} from './KeyboardUtil';
 
 var KEYDOWN_EVENT = 'keyboard.keydown';
 
@@ -100,6 +99,7 @@ Keyboard.prototype._keyHandler = function(event) {
 };
 
 Keyboard.prototype.bind = function(node) {
+
   // make sure that the keyboard is only bound once to the DOM
   this.unbind();
 

lib/features/keyboard/KeyboardBindings.js

@@ -2,7 +2,7 @@ import {
   isCmd,
   isKey,
   isShift
-} from './helpers';
+} from './KeyboardUtil';
 
 
 /**
@@ -15,21 +15,6 @@ export default function KeyboardBindings(keyboard, editorActions) {
 
   var config = keyboard._config;
 
-  keyboard.addListener(copy);
-  keyboard.addListener(paste);
-
-  keyboard.addListener(undo);
-  keyboard.addListener(redo);
-
-  keyboard.addListener(removeSelection);
-
-  keyboard.addListener(zoomDefault);
-  keyboard.addListener(zoomIn);
-  keyboard.addListener(zoomOut);
-
-  keyboard.addListener(moveCanvas);
-
-
   // undo
   // (CTRL|CMD) + Z
   function undo(context) {
@@ -195,6 +180,20 @@ export default function KeyboardBindings(keyboard, editorActions) {
       return true;
     }
   }
+
+  keyboard.addListener(copy);
+  keyboard.addListener(paste);
+
+  keyboard.addListener(undo);
+  keyboard.addListener(redo);
+
+  keyboard.addListener(removeSelection);
+
+  keyboard.addListener(zoomDefault);
+  keyboard.addListener(zoomIn);
+  keyboard.addListener(zoomOut);
+
+  keyboard.addListener(moveCanvas);
 }
 
 KeyboardBindings.$inject = [

lib/features/keyboard/KeyboardUtil.js

@@ -0,0 +1,42 @@
+import { isArray } from 'min-dash';
+
+/**
+ * Returns true if event was triggered with any modifier
+ * @param {KeyboardEvent} event
+ */
+export function hasModifier(event) {
+  return (event.ctrlKey || event.metaKey || event.shiftKey || event.altKey);
+}
+
+/**
+ * @param {KeyboardEvent} event
+ */
+export function isCmd(event) {
+
+  // ensure we don't react to AltGr
+  // (mapped to CTRL + ALT)
+  if (event.altKey) {
+    return false;
+  }
+
+  return event.ctrlKey || event.metaKey;
+}
+
+/**
+ * Checks if key pressed is one of provided keys.
+ *
+ * @param {String|String[]} keys
+ * @param {KeyboardEvent} event
+ */
+export function isKey(keys, event) {
+  keys = isArray(keys) ? keys : [ keys ];
+
+  return keys.indexOf(event.key) > -1;
+}
+
+/**
+ * @param {KeyboardEvent} event
+ */
+export function isShift(event) {
+  return event.shiftKey;
+}

test/helper/index.js

@@ -7,7 +7,6 @@ import {
 import TestContainer from 'mocha-test-container-support';
 
 import Diagram from '../../lib/Diagram';
-import { event as domEvent } from 'min-dom';
 
 var OPTIONS, DIAGRAM_JS;
 
@@ -159,31 +158,4 @@ export function insertCSS(name, css) {
 
 export function getDiagramJS() {
   return DIAGRAM_JS;
-}
-
-function DomEventTracker() {
-
-  this.install = function() {
-
-    domEvent.__bind = domEvent.bind;
-    domEvent.__unbind = domEvent.__unbind || domEvent.unbind;
-
-    domEvent.bind = function(el, type, fn, capture) {
-      el.$$listenerCount = (el.$$listenerCount || 0) + 1;
-      return domEvent.__bind(el, type, fn, capture);
-    };
-
-    domEvent.unbind = function(el, type, fn, capture) {
-      el.$$listenerCount = (el.$$listenerCount || 0) -1;
-      return domEvent.__unbind(el, type, fn, capture);
-    };
-  };
-
-  this.uninstall = function() {
-    domEvent.bind = domEvent.__bind;
-    domEvent.unbind = domEvent.__unbind;
-  };
-}
-
-
-export var DomMocking = new DomEventTracker();
+}

test/spec/features/keyboard/CopySpec.js

@@ -15,8 +15,11 @@ import keyboardModule from 'lib/features/keyboard';
 
 import { createKeyEvent } from 'test/util/KeyEvents';
 
+var spy = sinon.spy;
+
 var KEYS = [ 'c', 'C' ];
 
+
 describe('features/keyboard - copy', function() {
 
   var defaultDiagramConfig = {
@@ -30,14 +33,20 @@ describe('features/keyboard - copy', function() {
     }
   };
 
+  var decisionTable = [{
+    desc: 'should call copy',
+    keys: KEYS,
+    ctrlKey: true,
+    called: true
+  }, {
+    desc: 'should not call copy',
+    keys: KEYS,
+    ctrlKey: false,
+    called: false
+  }];
+
   beforeEach(bootstrapDiagram(defaultDiagramConfig));
 
-  /* eslint-disable no-multi-spaces */
-  var decisionTable = [
-    { desc: 'should call copy',     keys: KEYS, ctrlKey: true,  called: true },
-    { desc: 'should not call copy', keys: KEYS, ctrlKey: false, called: false },
-  ];
-  /* eslint-enable */
 
   forEach(decisionTable, function(testCase) {
 
@@ -46,21 +55,15 @@ describe('features/keyboard - copy', function() {
       it(testCase.desc, inject(function(keyboard, editorActions) {
 
         // given
-        var copySpy = sinon.spy(editorActions, 'trigger');
+        var copySpy = spy(editorActions, 'trigger');
 
-        var event = createKeyEvent(
-          key,
-          {
-            ctrlKey: testCase.ctrlKey
-          }
-        );
+        var event = createKeyEvent(key, { ctrlKey: testCase.ctrlKey });
 
         // when
         keyboard._keyHandler(event);
 
         // then
         expect(copySpy.calledWith('copy')).to.be.equal(testCase.called);
-
       }));
 
     });