Skip to content

Commit

Permalink
better key registration, more linting, default exports that doesn't work
Browse files Browse the repository at this point in the history
  • Loading branch information
deificx committed Jan 8, 2016
1 parent 2247e9d commit ec1ebea
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 27 deletions.
9 changes: 8 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"node": true
},
"plugins": [
"babel"
"babel",
"import"
],
"rules": {
/* http://eslint.org/docs/rules/#possible-errors */
Expand Down Expand Up @@ -138,6 +139,12 @@
"space-after-keywords": 1,
"space-before-blocks": 1,

"import/no-unresolved": [2, {"commonjs": true, "amd": false}],
"import/named": 2,
"import/namespace": 2,
"import/default": 2,
"import/export": 2,

/* babel plugin https://github.com/babel/eslint-plugin-babel#rules */
"babel/generator-star-spacing": 1,
"babel/new-cap": 1,
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"eslint": "^1.10.3",
"eslint-loader": "^1.1.1",
"eslint-plugin-babel": "^3.0.0",
"eslint-plugin-import": "^0.12.1",
"eventemitter3": "^1.1.1",
"webpack": "^1.12.9",
"webpack-dev-server": "^1.14.0"
Expand Down
61 changes: 36 additions & 25 deletions src/controls.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,42 @@ import {
} from './constants';

import EventEmitter from 'eventemitter3';
const events = new EventEmitter();

var events = new EventEmitter();

import keypress from '../lib/keypress';

import keypress from '../lib/keypress'; // eslint-disable-line
const listener = new keypress.Listener();

listener.simple_combo('up', () => {
events.emit('move', UP);
});

listener.simple_combo('right', () => {
events.emit('move', RIGHT);
});

listener.simple_combo('down', () => {
events.emit('move', DOWN);
});

listener.simple_combo('left', () => {
events.emit('move', LEFT);
});

listener.simple_combo('enter', () => {
events.emit('new_game');
});

module.exports = events;
listener.register_many([
{
keys: 'up',
'on_keydown': () => { events.emit('move', UP); },
'prevent_repeat': true,
},
{
keys: 'right',
'on_keydown': () => { events.emit('move', RIGHT); },
'prevent_repeat': true,
},
{
keys: 'down',
'on_keydown': () => { events.emit('move', DOWN); },
'prevent_repeat': true,
},
{
keys: 'left',
'on_keydown': () => { events.emit('move', LEFT); },
'prevent_repeat': true,
},
{
keys: 'enter',
'on_keydown': () => { events.emit('new_game'); },
'prevent_repeat': true,
},
{
keys: 'space',
'on_keydown': () => { events.emit('new_game'); },
'prevent_repeat': true,
},
]);

export default events;
2 changes: 1 addition & 1 deletion src/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ if (!canvas) {
canvas.width = document.body.offsetWidth;
canvas.height = document.body.offsetHeight;

module.exports = canvas;
export default canvas;

0 comments on commit ec1ebea

Please sign in to comment.