Upgrade to atom-keymap@0.14.0 and account for renamed methods

This commit is contained in:
Nathan Sobo
2014-03-31 15:45:01 -06:00
parent 477624387f
commit d612a71af5
4 changed files with 12 additions and 12 deletions

View File

@@ -15,7 +15,7 @@
"atomShellVersion": "0.11.4",
"dependencies": {
"async": "0.2.6",
"atom-keymap": "^0.13.0",
"atom-keymap": "^0.14.0-rc1",
"bootstrap": "git://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
"clear-cut": "0.4.0",
"coffee-script": "1.7.0",

View File

@@ -6,7 +6,7 @@ require '../vendor/jasmine-jquery'
path = require 'path'
_ = require 'underscore-plus'
fs = require 'fs-plus'
Keymap = require '../src/keymap-extensions'
KeymapManager = require '../src/keymap-extensions'
{$, WorkspaceView} = require 'atom'
Config = require '../src/config'
{Point} = require 'text-buffer'
@@ -187,7 +187,7 @@ window.keydownEvent = (key, properties={}) ->
originalEventProperties.cmd = properties.metaKey
originalEventProperties.target = properties.target?[0] ? properties.target
originalEventProperties.which = properties.which
originalEvent = Keymap.keydownEvent(key, originalEventProperties)
originalEvent = KeymapManager.keydownEvent(key, originalEventProperties)
properties = $.extend({originalEvent}, properties)
$.Event("keydown", properties)

View File

@@ -140,7 +140,7 @@ class Atom extends Model
@loadTime = null
Config = require './config'
Keymap = require './keymap-extensions'
KeymapManager = require './keymap-extensions'
PackageManager = require './package-manager'
Clipboard = require './clipboard'
Syntax = require './syntax'
@@ -157,7 +157,7 @@ class Atom extends Model
process.env.NODE_PATH = exportsPath
@config = new Config({configDirPath, resourcePath})
@keymap = new Keymap({configDirPath, resourcePath})
@keymap = new KeymapManager({configDirPath, resourcePath})
@packages = new PackageManager({devMode, configDirPath, resourcePath})
@themes = new ThemeManager({packageManager: @packages, configDirPath, resourcePath})
@contextMenu = new ContextMenuManager(devMode)

View File

@@ -1,27 +1,27 @@
fs = require 'fs-plus'
path = require 'path'
Keymap = require 'atom-keymap'
KeymapManager = require 'atom-keymap'
CSON = require 'season'
{jQuery} = require 'space-pen'
Keymap::loadBundledKeymaps = ->
@loadKeyBindings(path.join(@resourcePath, 'keymaps'))
KeymapManager::loadBundledKeymaps = ->
@loadKeymap(path.join(@resourcePath, 'keymaps'))
@emit('bundled-keymaps-loaded')
Keymap::getUserKeymapPath = ->
KeymapManager::getUserKeymapPath = ->
if userKeymapPath = CSON.resolve(path.join(@configDirPath, 'keymap'))
userKeymapPath
else
path.join(@configDirPath, 'keymap.cson')
Keymap::loadUserKeymap = ->
KeymapManager::loadUserKeymap = ->
userKeymapPath = @getUserKeymapPath()
if fs.isFileSync(userKeymapPath)
@loadKeyBindings(userKeymapPath, watch: true, suppressErrors: true)
@loadKeymap(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
module.exports = KeymapManager