Merge pull request mapbox#315 from lukeelmers/master

Ensure keybindings option is enforced
bensleveritt · May 31, 2016 · 310394f · 310394f
2 parents bddf077 + 90e7afa
commit 310394f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/events.js b/src/events.js
@@ -144,17 +144,21 @@ module.exports = function(ctx) {
       ctx.map.on('mousedown', events.mousedown);
       ctx.map.on('mouseup', events.mouseup);
 
-      ctx.container.addEventListener('keydown', events.keydown);
-      ctx.container.addEventListener('keyup', events.keyup);
+      if (ctx.options.keybindings) {
+        ctx.container.addEventListener('keydown', events.keydown);
+        ctx.container.addEventListener('keyup', events.keyup);
+      }
     },
     removeEventListeners: function() {
       ctx.map.off('mousemove', events.mousemove);
 
       ctx.map.off('mousedown', events.mousedown);
       ctx.map.off('mouseup', events.mouseup);
 
-      ctx.container.removeEventListener('keydown', events.keydown);
-      ctx.container.removeEventListener('keyup', events.keyup);
+      if (ctx.options.keybindings) {
+        ctx.container.removeEventListener('keydown', events.keydown);
+        ctx.container.removeEventListener('keyup', events.keyup);
+      }
     }
   };