This commit is contained in:
Nathan Sobo
2015-10-05 16:50:19 -06:00
parent c4cfbab408
commit 75fbeab8b4
2 changed files with 8 additions and 8 deletions

View File

@@ -15,6 +15,7 @@ WindowEventHandler = require './window-event-handler'
StylesElement = require './styles-element'
StorageFolder = require './storage-folder'
{getWindowLoadSettings, setWindowLoadSettings} = require './window-load-settings-helpers'
registerDefaultCommands = require './register-default-commands'
Workspace = require './workspace'
PanelContainer = require './panel-container'
@@ -116,11 +117,11 @@ class AtomEnvironment extends Model
DeserializerManager = require './deserializer-manager'
@deserializers = new DeserializerManager(this)
@deserializeTimings = {}
@registerDeserializers()
@registerDefaultDeserializers()
ViewRegistry = require './view-registry'
@views = new ViewRegistry(this)
@registerViewProviders()
@registerDefaultViewProviders()
NotificationManager = require './notification-manager'
@notifications = new NotificationManager
@@ -139,7 +140,6 @@ class AtomEnvironment extends Model
CommandRegistry = require './command-registry'
@commands = new CommandRegistry
registerDefaultCommands = require './register-default-commands'
registerDefaultCommands(this)
PackageManager = require './package-manager'
@@ -185,7 +185,7 @@ class AtomEnvironment extends Model
setConfigSchema: ->
@config.setSchema null, {type: 'object', properties: _.clone(require('./config-schema'))}
registerDeserializers: ->
registerDefaultDeserializers: ->
@deserializers.add(Workspace)
@deserializers.add(PaneContainer)
@deserializers.add(PaneAxis)
@@ -194,7 +194,7 @@ class AtomEnvironment extends Model
@deserializers.add(TextEditor)
@deserializers.add(TextBuffer)
registerViewProviders: ->
registerDefaultViewProviders: ->
@views.addViewProvider Workspace, (model, env) ->
new WorkspaceElement().initialize(model, env)
@views.addViewProvider PanelContainer, (model) ->
@@ -224,7 +224,7 @@ class AtomEnvironment extends Model
@workspace.open(@getUserInitScriptPath())
reset: ->
@config.reset()
@config.clear()
@setConfigSchema()
@keymaps.clear()

View File

@@ -334,9 +334,9 @@ class Config
constructor: ({@configDirPath, @resourcePath, @notificationManager}={}) ->
@configFilePath = fs.resolve(@configDirPath, 'config', ['json', 'cson'])
@configFilePath ?= path.join(@configDirPath, 'config.cson')
@reset()
@clear()
reset: ->
clear: ->
@emitter = new Emitter
@schema =
type: 'object'