From ff23f62c3e87c8a721537d3a875cff9ae612e2fd Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 17 Mar 2014 12:50:24 -0600 Subject: [PATCH] Move jQuery.Event::abortKeyBinding to keymap-extensions --- src/keymap-extensions.coffee | 6 ++++++ src/space-pen-extensions.coffee | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/keymap-extensions.coffee b/src/keymap-extensions.coffee index a6aa5524f..c86e82b11 100644 --- a/src/keymap-extensions.coffee +++ b/src/keymap-extensions.coffee @@ -2,6 +2,7 @@ fs = require 'fs-plus' path = require 'path' Keymap = require 'atom-keymap' CSON = require 'season' +{jQuery} = require 'space-pen' Keymap::loadBundledKeymaps = -> @loadKeyBindings(path.join(@resourcePath, 'keymaps')) @@ -18,4 +19,9 @@ Keymap::loadUserKeymap = -> if fs.isFileSync(userKeymapPath) @loadKeyBindings(userKeymapPath, watch: true, suppressErrors: true) +# This enables command handlers registered via jQuery to call +# `.abortKeyBinding()` on the `jQuery.Event` object passed to the handler. +jQuery.Event::abortKeyBinding = -> + @originalEvent?.abortKeyBinding?() + module.exports = Keymap diff --git a/src/space-pen-extensions.coffee b/src/space-pen-extensions.coffee index 02850180a..04e411114 100644 --- a/src/space-pen-extensions.coffee +++ b/src/space-pen-extensions.coffee @@ -69,7 +69,4 @@ jQuery(document.body).on 'show.bs.tooltip', ({target}) -> jQuery.fn.setTooltip.getKeystroke = getKeystroke jQuery.fn.setTooltip.humanizeKeystrokes = humanizeKeystrokes -jQuery.Event::abortKeyBinding = -> - @originalEvent?.abortKeyBinding?() - module.exports = spacePen