mirror of
https://github.com/atom/atom.git
synced 2026-01-24 14:28:14 -05:00
Rename userConfigurationPath to configFilePath so I can add configDirPath as well
This commit is contained in:
@@ -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: ->
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) ->
|
||||
|
||||
Reference in New Issue
Block a user