better keyup stuff

This commit is contained in:
Peter Cottle 2013-01-06 17:31:29 -08:00
parent c5615fe15a
commit 3d02036a54
3 changed files with 28 additions and 12 deletions

View file

@ -6304,16 +6304,19 @@ var init = function() {
eventBaton.trigger('documentClick', e); eventBaton.trigger('documentClick', e);
}); });
$(document).bind('keydown', function(e) { $(document).bind('keydown', function(e) {
eventBaton.trigger('keydown', e); eventBaton.trigger('docKeydown', e);
}); });
$(document).bind('keyup', function(e) { $(document).bind('keyup', function(e) {
eventBaton.trigger('keyup', e); eventBaton.trigger('docKeyup', e);
}); });
$(window).on('resize', function(e) { $(window).on('resize', function(e) {
events.trigger('resize', e); events.trigger('resize', e);
}); });
eventBaton.stealBaton('docKeydown', function() { });
eventBaton.stealBaton('docKeyup', function() { });
// zoom level measure, I wish there was a jquery event for this :/ // zoom level measure, I wish there was a jquery event for this :/
require('../util/zoomLevel').setupZoomPoll(function(level) { require('../util/zoomLevel').setupZoomPoll(function(level) {
eventBaton.trigger('zoomChange', level); eventBaton.trigger('zoomChange', level);
@ -10042,6 +10045,8 @@ exports.NextLevelConfirm = NextLevelConfirm;
require.define("/src/js/util/keyboard.js",function(require,module,exports,__dirname,__filename,process,global){var _ = require('underscore'); require.define("/src/js/util/keyboard.js",function(require,module,exports,__dirname,__filename,process,global){var _ = require('underscore');
var Backbone = require('backbone'); var Backbone = require('backbone');
var Main = require('../app');
var mapKeycodeToKey = function(keycode) { var mapKeycodeToKey = function(keycode) {
// HELP WANTED -- internationalize? Dvorak? I have no idea // HELP WANTED -- internationalize? Dvorak? I have no idea
var keyMap = { var keyMap = {
@ -10066,11 +10071,11 @@ function KeyboardListener(options) {
} }
KeyboardListener.prototype.listen = function() { KeyboardListener.prototype.listen = function() {
$(document).bind('keydown', this.keydownListener); Main.getEventBaton().stealBaton('docKeydown', this.keydownListener, this);
}; };
KeyboardListener.prototype.mute = function() { KeyboardListener.prototype.mute = function() {
$(document).unbind('keydown', this.keydownListener); Main.getEventBaton().releaseBaton('docKeydown', this.keydownListener, this);
}; };
KeyboardListener.prototype.keydown = function(e) { KeyboardListener.prototype.keydown = function(e) {
@ -16045,16 +16050,19 @@ var init = function() {
eventBaton.trigger('documentClick', e); eventBaton.trigger('documentClick', e);
}); });
$(document).bind('keydown', function(e) { $(document).bind('keydown', function(e) {
eventBaton.trigger('keydown', e); eventBaton.trigger('docKeydown', e);
}); });
$(document).bind('keyup', function(e) { $(document).bind('keyup', function(e) {
eventBaton.trigger('keyup', e); eventBaton.trigger('docKeyup', e);
}); });
$(window).on('resize', function(e) { $(window).on('resize', function(e) {
events.trigger('resize', e); events.trigger('resize', e);
}); });
eventBaton.stealBaton('docKeydown', function() { });
eventBaton.stealBaton('docKeyup', function() { });
// zoom level measure, I wish there was a jquery event for this :/ // zoom level measure, I wish there was a jquery event for this :/
require('../util/zoomLevel').setupZoomPoll(function(level) { require('../util/zoomLevel').setupZoomPoll(function(level) {
eventBaton.trigger('zoomChange', level); eventBaton.trigger('zoomChange', level);
@ -19878,6 +19886,8 @@ require("/src/js/util/index.js");
require.define("/src/js/util/keyboard.js",function(require,module,exports,__dirname,__filename,process,global){var _ = require('underscore'); require.define("/src/js/util/keyboard.js",function(require,module,exports,__dirname,__filename,process,global){var _ = require('underscore');
var Backbone = require('backbone'); var Backbone = require('backbone');
var Main = require('../app');
var mapKeycodeToKey = function(keycode) { var mapKeycodeToKey = function(keycode) {
// HELP WANTED -- internationalize? Dvorak? I have no idea // HELP WANTED -- internationalize? Dvorak? I have no idea
var keyMap = { var keyMap = {
@ -19902,11 +19912,11 @@ function KeyboardListener(options) {
} }
KeyboardListener.prototype.listen = function() { KeyboardListener.prototype.listen = function() {
$(document).bind('keydown', this.keydownListener); Main.getEventBaton().stealBaton('docKeydown', this.keydownListener, this);
}; };
KeyboardListener.prototype.mute = function() { KeyboardListener.prototype.mute = function() {
$(document).unbind('keydown', this.keydownListener); Main.getEventBaton().releaseBaton('docKeydown', this.keydownListener, this);
}; };
KeyboardListener.prototype.keydown = function(e) { KeyboardListener.prototype.keydown = function(e) {

View file

@ -48,15 +48,19 @@ var init = function() {
eventBaton.trigger('documentClick', e); eventBaton.trigger('documentClick', e);
}); });
$(document).bind('keydown', function(e) { $(document).bind('keydown', function(e) {
eventBaton.trigger('keydown', e); eventBaton.trigger('docKeydown', e);
}); });
$(document).bind('keyup', function(e) { $(document).bind('keyup', function(e) {
eventBaton.trigger('keyup', e); eventBaton.trigger('docKeyup', e);
}); });
$(window).on('resize', function(e) { $(window).on('resize', function(e) {
events.trigger('resize', e); events.trigger('resize', e);
}); });
eventBaton.stealBaton('docKeydown', function() { });
eventBaton.stealBaton('docKeyup', function() { });
// zoom level measure, I wish there was a jquery event for this :/ // zoom level measure, I wish there was a jquery event for this :/
require('../util/zoomLevel').setupZoomPoll(function(level) { require('../util/zoomLevel').setupZoomPoll(function(level) {
eventBaton.trigger('zoomChange', level); eventBaton.trigger('zoomChange', level);

View file

@ -1,6 +1,8 @@
var _ = require('underscore'); var _ = require('underscore');
var Backbone = require('backbone'); var Backbone = require('backbone');
var Main = require('../app');
var mapKeycodeToKey = function(keycode) { var mapKeycodeToKey = function(keycode) {
// HELP WANTED -- internationalize? Dvorak? I have no idea // HELP WANTED -- internationalize? Dvorak? I have no idea
var keyMap = { var keyMap = {
@ -25,11 +27,11 @@ function KeyboardListener(options) {
} }
KeyboardListener.prototype.listen = function() { KeyboardListener.prototype.listen = function() {
$(document).bind('keydown', this.keydownListener); Main.getEventBaton().stealBaton('docKeydown', this.keydownListener, this);
}; };
KeyboardListener.prototype.mute = function() { KeyboardListener.prototype.mute = function() {
$(document).unbind('keydown', this.keydownListener); Main.getEventBaton().releaseBaton('docKeydown', this.keydownListener, this);
}; };
KeyboardListener.prototype.keydown = function(e) { KeyboardListener.prototype.keydown = function(e) {