Rename 'disabledKeymaps' -> 'packagesWithKeymapsDisabled'

This commit is contained in:
Max Brunsfeld
2015-07-31 10:37:56 -07:00
parent bd5403fe07
commit b682658427
3 changed files with 12 additions and 12 deletions

View File

@@ -444,7 +444,7 @@ describe "PackageManager", ->
expect(atom.keymaps.findKeyBindings(keystrokes: 'ctrl-z', target: element1[0])).toHaveLength 0
atom.config.set("core.disabledKeymaps", ["package-with-keymaps-manifest"])
atom.config.set("core.packagesWithKeymapsDisabled", ["package-with-keymaps-manifest"])
waitsForPromise ->
atom.packages.activatePackage("package-with-keymaps-manifest")
@@ -455,16 +455,16 @@ describe "PackageManager", ->
describe "when the package's keymaps are disabled and re-enabled after it is activated", ->
it "removes and re-adds the keymaps", ->
element1 = $$ -> @div class: 'test-1'
atom.packages.observeDisabledKeymaps()
atom.packages.observePackagesWithKeymapsDisabled()
waitsForPromise ->
atom.packages.activatePackage("package-with-keymaps-manifest")
runs ->
atom.config.set("core.disabledKeymaps", ['package-with-keymaps-manifest'])
atom.config.set("core.packagesWithKeymapsDisabled", ['package-with-keymaps-manifest'])
expect(atom.keymaps.findKeyBindings(keystrokes: 'ctrl-z', target: element1[0])).toHaveLength 0
atom.config.set("core.disabledKeymaps", [])
atom.config.set("core.packagesWithKeymapsDisabled", [])
expect(atom.keymaps.findKeyBindings(keystrokes: 'ctrl-z', target: element1[0])[0].command).toBe 'keymap-1'
describe "menu loading", ->

View File

@@ -310,12 +310,12 @@ class PackageManager
@activatePackage(packageName) for packageName in packagesToEnable
null
unobserveDisabledKeymaps: ->
@disabledKeymapsSubscription?.dispose()
@disabledKeymapsSubscription = null
unobservePackagesWithKeymapsDisabled: ->
@packagesWithKeymapsDisabledSubscription?.dispose()
@packagesWithKeymapsDisabledSubscription = null
observeDisabledKeymaps: ->
@disabledKeymapsSubscription ?= atom.config.onDidChange 'core.disabledKeymaps', ({newValue, oldValue}) =>
observePackagesWithKeymapsDisabled: ->
@packagesWithKeymapsDisabledSubscription ?= atom.config.onDidChange 'core.packagesWithKeymapsDisabled', ({newValue, oldValue}) =>
keymapsToEnable = _.difference(oldValue, newValue)
keymapsToDisable = _.difference(newValue, oldValue)
@@ -409,7 +409,7 @@ class PackageManager
promises.push(promise) unless pack.hasActivationCommands()
return
@observeDisabledPackages()
@observeDisabledKeymaps()
@observePackagesWithKeymapsDisabled()
promises
# Activate a single package by name
@@ -438,7 +438,7 @@ class PackageManager
@deactivatePackage(pack.name) for pack in @getLoadedPackages()
return
@unobserveDisabledPackages()
@unobserveDisabledKeymaps()
@unobservePackagesWithKeymapsDisabled()
# Deactivate the package with the given name
deactivatePackage: (name) ->

View File

@@ -201,7 +201,7 @@ class Package
activateResources: ->
@activationDisposables = new CompositeDisposable
keymapIsDisabled = _.include(atom.config.get("core.disabledKeymaps") ? [], @name)
keymapIsDisabled = _.include(atom.config.get("core.packagesWithKeymapsDisabled") ? [], @name)
if keymapIsDisabled
@deactivateKeymaps()
else