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

Support a scopeSelector in getSettings()

Browse Source
This commit is contained in:
Ben Ogle
2014-10-15 16:26:03 -07:00
parent 757abfe3db
commit a42b3ff171
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/config.coffee
View File

@@ -588,8 +588,14 @@ class Config
# Extended: Returns a new {Object} containing all of the global settings and
# defaults. This does not include scoped settings.
getSettings: ->
_.deepExtend(@settings, @defaultSettings)
getSettings: (scopeSelector) ->
settings = _.deepExtend(@settings, @defaultSettings)
if scopeSelector?
scopedSettings = @scopedSettingsStore.propertiesForSelector(scopeSelector)
settings = _.deepExtend(scopedSettings, settings)
settings
# Extended: Get the {String} path to the config file being used.
getUserConfigPath: ->