Merge tag 'v1.2.0'

v1.2.0
jonathanlloyd · Feb 6, 2017 · 61c1445 · 61c1445
2 parents 0334834 + 85d966a
commit 61c1445
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,6 @@
 language: node_js
+node_js:
+  - "node"
 install:
   - "npm install"
 script:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Change Log
 
-## [unreleased]
-
+## [v1.2.0] - 06/02/2017
+### Added
+- Added keypad mouse support to demo
 
 ## [v1.1.0] - 16/01/2017
 ### Added

diff --git a/demo/css/demo.css b/demo/css/demo.css
@@ -52,7 +52,7 @@
   background: #81ce00;
   margin: 0.2em 0.1em;
   padding: 0;
-  cursor: default;
+  cursor: pointer;
   -webkit-user-select: none;  /* Chrome all / Safari all */
   -moz-user-select: none;     /* Firefox all */
   -ms-user-select: none;      /* IE 10+ */

diff --git a/demo/js/demo.js b/demo/js/demo.js
@@ -50,6 +50,7 @@ var RUNNING = false;
 
 interpreter = new MatchboxChip8.Interpreter(DEBUG);
 
+$( document ).ready(addClickListeners);
 
 function renderScreen(interpreter) {
     for(var x = 0; x < 64; x += 1) {
@@ -85,8 +86,7 @@ window.onkeydown = function(e) {
         if(e.keyCode in KEYCODE_KEY) {
             var key = KEYCODE_KEY[e.keyCode];
             var domKey = KEY_DOMKEY[key];
-            domKey.addClass("demo-key-active");
-            interpreter.keyDown(key);
+            keyPadDown(domKey, key);
         }
     }
 }
@@ -95,8 +95,7 @@ window.onkeyup = function(e) {
     if(e.keyCode in KEYCODE_KEY) {
         var key = KEYCODE_KEY[e.keyCode];
         var domKey = KEY_DOMKEY[key];
-        domKey.removeClass("demo-key-active");
-        interpreter.keyUp(key);
+        keyPadUp(domKey, key);
     }
 }
 
@@ -110,6 +109,29 @@ function loadRomFromURL(URL) {
     });
 }
 
+function addClickListeners() {
+    for(key in KEY_DOMKEY){
+        KEY_DOMKEY[key].mousedown({keyCode: key}, function(e){
+            var domKey = $(e.target);
+            keyPadDown(domKey, e.data.keyCode);
+        });
+
+        KEY_DOMKEY[key].mouseup({keyCode: key}, function(e){
+            var domKey = $(e.target);
+            keyPadUp(domKey, e.data.keyCode);
+        });
+    }
+}
+
+function keyPadDown(domKey, keyCode){
+    domKey.addClass("demo-key-active");
+    interpreter.keyDown(keyCode);
+}
+
+function keyPadUp(domKey, keyCode){
+    domKey.removeClass("demo-key-active");
+    interpreter.keyUp(keyCode);
+}
 
 return {
     "loadRomFromURL": loadRomFromURL,