meta-, opens user configuration file

This commit is contained in:
Corey Johnson
2012-03-20 15:56:05 -07:00
parent ed36f7d440
commit 0317dada8e
3 changed files with 9 additions and 4 deletions

View File

@@ -1,4 +1,6 @@
Keymap = require 'keymap'
fs = require 'fs'
$ = require 'jquery'
_ = require 'underscore'
require 'underscore-extensions'
@@ -14,7 +16,7 @@ class App
@windows = []
@setUpKeymap()
@tabText = " "
@userConfigurationPath = "~/.atom"
@userConfigurationPath = require.resolve(fs.absolute("~/.atom"))
setUpKeymap: ->
@keymap = new Keymap()

View File

@@ -13,14 +13,18 @@ class Keymap
@bindKeys "*",
'meta-n': 'newWindow'
'meta-o': 'open'
'meta-,': 'open-user-configuration'
@_newWindow = => $native.newWindow()
@_open = =>
url = $native.openDialog()
atom.open(url) if url
@_openUserConfiguration = =>
atom.open(atom.userConfigurationPath)
$(document).on 'newWindow', @_newWindow
$(document).on 'open', @_open
$(document).on 'open-user-configuration', @_openUserConfiguration
unbindDefaultKeys: ->
$(document).unbind 'newWindow', @_newWindow

View File

@@ -47,11 +47,10 @@ windowAdditions =
$(@rootViewParentSelector).append @rootView
loadUserConfiguration: ->
absolutePath = fs.absolute(atom.userConfigurationPath)
try
require absolutePath if fs.exists(absolutePath)
require atom.userConfigurationPath if fs.exists(atom.userConfigurationPath)
catch error
console.error "Failed to load `#{absolutePath}`", error
console.error "Failed to load `#{atom.userConfigurationPath}`", error
@showConsole()
requireStylesheet: (path) ->