github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-18 02:21:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't clobber module by reassigning to path

Browse Source
This commit is contained in:
Kevin Sawicki
2013-06-12 16:41:13 -07:00
parent 835cd70ded
commit 1548ef10b0
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/atom-package.coffee
View File

@@ -56,13 +56,14 @@ class AtomPackage extends Package
@mainModule?.activateConfig?()
activateResources: ->
keymap.add(path, map) for [path, map] in @keymaps
applyStylesheet(path, content) for [path, content] in @stylesheets
keymap.add(keymapPath, map) for [keymapPath, map] in @keymaps
applyStylesheet(stylesheetPath, content) for [stylesheetPath, content] in @stylesheets
syntax.addGrammar(grammar) for grammar in @grammars
syntax.addProperties(path, selector, properties) for [path, selector, properties] in @scopedProperties
for [propertiesPath, selector, properties] in @scopedProperties
syntax.addProperties(propertiesPath, selector, properties)
loadKeymaps: ->
@keymaps = @getKeymapPaths().map (path) -> [path, CSON.readFileSync(path)]
@keymaps = @getKeymapPaths().map (keymapPath) -> [keymapPath, CSON.readFileSync(keymapPath)]
getKeymapPaths: ->
keymapsDirPath = path.join(@path, 'keymaps')
@@ -72,7 +73,7 @@ class AtomPackage extends Package
fsUtils.list(keymapsDirPath, ['cson', 'json'])
loadStylesheets: ->
@stylesheets = @getStylesheetPaths().map (path) -> [path, loadStylesheet(path)]
@stylesheets = @getStylesheetPaths().map (stylesheetPath) -> [stylesheetPath, loadStylesheet(stylesheetPath)]
getStylesheetPaths: ->
stylesheetDirPath = path.join(@path, 'stylesheets')
@@ -112,8 +113,8 @@ class AtomPackage extends Package
deactivateResources: ->
syntax.removeGrammar(grammar) for grammar in @grammars
syntax.removeProperties(path) for [path] in @scopedProperties
keymap.remove(path) for [path] in @keymaps
removeStylesheet(path) for [path] in @stylesheets
keymap.remove(keymapPath) for [keymapPath] in @keymaps
removeStylesheet(stylesheetPath) for [stylesheetPath] in @stylesheets
requireMainModule: ->
return @mainModule if @mainModule