diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee index 9571e38c1..b3e0eabfe 100644 --- a/src/atom-environment.coffee +++ b/src/atom-environment.coffee @@ -126,6 +126,7 @@ class AtomEnvironment extends Model Config = require './config' @config = new Config({configDirPath, resourcePath, notificationManager: @notifications}) + @setConfigSchema() KeymapManager = require './keymap-extensions' @keymaps = new KeymapManager({configDirPath, resourcePath, notificationManager: @notifications}) @@ -177,11 +178,12 @@ class AtomEnvironment extends Model }) @themes.workspace = @workspace + @themes.loadBaseStylesheets() @initialStyleElements = @styles.getSnapshot() - @setConfigSchema() @keymaps.subscribeToFileReadFailure() @keymaps.loadBundledKeymaps() + registerDefaultCommands(this) @registerDefaultOpeners() @registerDefaultDeserializers() @@ -585,6 +587,7 @@ class AtomEnvironment extends Model stylesElement = new StylesElement stylesElement.initialize(this) + document.head.appendChild(stylesElement) @windowEventHandler = new WindowEventHandler(this) diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee index 4ccee0a4c..649478841 100644 --- a/src/theme-manager.coffee +++ b/src/theme-manager.coffee @@ -17,7 +17,6 @@ class ThemeManager @packageManager.registerPackageActivator(this, ['theme']) @packageManager.onDidActivateInitialPackages => @onDidChangeActiveThemes => @packageManager.reloadActivePackageStyleSheets() - @loadBaseStylesheets() ### Section: Event Subscription