github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use core: instead of core/ when adding resources during snapshot

Browse Source
This commit is contained in:
Antonio Scandurra
2017-03-28 13:35:34 +02:00
parent eabe693179
commit 5e6938c1a8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/keymap-extensions.coffee
View File

@@ -17,7 +17,7 @@ KeymapManager::canLoadBundledKeymapsFromMemory = ->
KeymapManager::loadBundledKeymaps = ->
if bundledKeymaps?
for keymapName, keymap of bundledKeymaps
keymapPath = "core/#{keymapName}"
keymapPath = "core:#{keymapName}"
@add(keymapPath, keymap, 0, @devMode ? false)
else
keymapsPath = path.join(@resourcePath, 'keymaps')

6
src/package.coffee
View File

@@ -325,14 +325,14 @@ class Package
loadKeymaps: ->
if @bundledPackage and @packageManager.packagesCache[@name]?
@keymaps = (["core/#{keymapPath}", keymapObject] for keymapPath, keymapObject of @packageManager.packagesCache[@name].keymaps)
@keymaps = (["core:#{keymapPath}", keymapObject] for keymapPath, keymapObject of @packageManager.packagesCache[@name].keymaps)
else
@keymaps = @getKeymapPaths().map (keymapPath) -> [keymapPath, CSON.readFileSync(keymapPath, allowDuplicateKeys: false) ? {}]
return
loadMenus: ->
if @bundledPackage and @packageManager.packagesCache[@name]?
@menus = (["core/#{menuPath}", menuObject] for menuPath, menuObject of @packageManager.packagesCache[@name].menus)
@menus = (["core:#{menuPath}", menuObject] for menuPath, menuObject of @packageManager.packagesCache[@name].menus)
else
@menus = @getMenuPaths().map (menuPath) -> [menuPath, CSON.readFileSync(menuPath) ? {}]
return
@@ -476,7 +476,7 @@ class Package
new Promise (resolve) =>
if @preloadedPackage
for settingsPath, scopedProperties of @packageManager.packagesCache[@name].settings
settings = new ScopedProperties("core/#{settingsPath}", scopedProperties ? {}, @config)
settings = new ScopedProperties("core:#{settingsPath}", scopedProperties ? {}, @config)
@settings.push(settings)
settings.activate() if @settingsActivated
resolve()