Rename userConfigurationPath to configFilePath so I can add configDirPath as well

This commit is contained in:
David Graham & Nathan Sobo
2012-06-20 11:19:40 -06:00
parent 498adc00bf
commit dc6c0a3e35
3 changed files with 7 additions and 5 deletions

View File

@@ -9,13 +9,15 @@ module.exports =
class Atom
keymap: null
windows: null
userConfigurationPath: null
configFilePath: null
configDirPath: null
rootViewStates: null
constructor: (@loadPath, nativeMethods) ->
@windows = []
@setUpKeymap()
@userConfigurationPath = fs.absolute "~/.atom/atom.coffee"
@configDirPath = fs.absolute("~/.atom")
@configFilePath = fs.join(@configDirPath, "atom.coffee")
@rootViewStates = {}
setUpKeymap: ->

View File

@@ -20,7 +20,7 @@ class Keymap
'meta-o': 'open'
$(document).on 'new-window', => $native.newWindow()
$(document).on 'open-user-configuration', => atom.open(atom.userConfigurationPath)
$(document).on 'open-user-configuration', => atom.open(atom.configFilePath)
$(document).on 'open', =>
path = $native.openDialog()
atom.open(path) if path

View File

@@ -50,9 +50,9 @@ windowAdditions =
loadUserConfiguration: ->
try
require atom.userConfigurationPath if fs.exists(atom.userConfigurationPath)
require atom.configFilePath if fs.exists(atom.configFilePath)
catch error
console.error "Failed to load `#{atom.userConfigurationPath}`", error.message, error
console.error "Failed to load `#{atom.configFilePath}`", error.message, error
@showConsole()
requireStylesheet: (path) ->