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

Merge remote-tracking branch 'origin/master' into cj-keymap-cleanup

Browse Source
This commit is contained in:
probablycorey
2013-11-14 14:43:37 -08:00
parent e90f19da97 fa1600c53d
commit dd0938dca6
19 changed files with 90 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/menu-manager.coffee
View File

@@ -12,7 +12,7 @@ fs = require 'fs-plus'
module.exports =
class MenuManager
# Private:
constructor: ->
constructor: ({@resourcePath}) ->
@template = []
atom.keymap.on 'bundled-keymaps-loaded', => @loadCoreItems()
@@ -38,7 +38,8 @@ class MenuManager
# Private
loadCoreItems: ->
menuPaths = fs.listSync(atom.config.bundledMenusDirPath, ['cson', 'json'])
menusDirPath = path.join(@resourcePath, 'menus')
menuPaths = fs.listSync(menusDirPath, ['cson', 'json'])
for menuPath in menuPaths
data = CSON.readFileSync(menuPath)
@add(data.menu)