summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/mx/extensions
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-08-29 22:34:54 -0400
committerJules Laplace <jules@okfoc.us>2014-08-29 22:34:54 -0400
commit01755335859b19756f6d64a2f8a10ae98abceb5f (patch)
treed5ba0258769f85fff5512498b04c3c037daecf79 /public/assets/javascripts/mx/extensions
parent2235c34e498499b8141e835998b962067583a0ce (diff)
parent851ddfd46abb7f944c1a6b7f198b5fd8cabd4c13 (diff)
merge
Diffstat (limited to 'public/assets/javascripts/mx/extensions')
-rw-r--r--public/assets/javascripts/mx/extensions/mx.movements.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 3b7d3e2..669a7f4 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -34,8 +34,10 @@ MX.Movements = function (cam) {
init: function () {
document.addEventListener('keydown', function (e) {
- // console.log(e.keyCode)
- if (locked) return;
+ // console.log(e.keyCode)
+ if (locked || e.altKey || e.metaKey || e.ctrlKey) {
+ return
+ }
switch ( e.keyCode ) {
case 16: // shift