From 79b84b2433f2285dd67f4dfcf794e401c9310d7c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 22 Nov 2013 09:48:57 -0800 Subject: [PATCH] Move window.deserializeEditorWindow to Atom class --- spec/window-spec.coffee | 2 +- src/atom.coffee | 5 +++++ src/window.coffee | 7 +------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spec/window-spec.coffee b/spec/window-spec.coffee index 3633caf4a..d1a798ef5 100644 --- a/spec/window-spec.coffee +++ b/spec/window-spec.coffee @@ -11,7 +11,7 @@ describe "Window", -> atom.loadSettings.initialPath = atom.project.getPath() atom.project.destroy() windowEventHandler = new WindowEventHandler() - window.deserializeEditorWindow() + atom.deserializeEditorWindow() projectPath = atom.project.getPath() afterEach -> diff --git a/src/atom.coffee b/src/atom.coffee index 7fc0c9665..052e70066 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -132,6 +132,11 @@ class Atom @packages.packageStates = state.getObject('packageStates') ? {} state.remove('packageStates') + deserializeEditorWindow: -> + @deserializePackageStates() + @deserializeProject() + @deserializeRootView() + loadThemes: -> @themes.load() diff --git a/src/window.coffee b/src/window.coffee index 19b1db7b8..eec4f62a8 100644 --- a/src/window.coffee +++ b/src/window.coffee @@ -33,7 +33,7 @@ window.startEditorWindow = -> atom.keymap.loadBundledKeymaps() atom.themes.loadBaseStylesheets() atom.packages.loadPackages() - deserializeEditorWindow() + atom.deserializeEditorWindow() atom.packages.activate() atom.keymap.loadUserKeymap() atom.requireUserInitScript() @@ -68,11 +68,6 @@ installApmCommand = (callback) -> commandPath = path.join(resourcePath, 'node_modules', '.bin', 'apm') require('./command-installer').install(commandPath, callback) -window.deserializeEditorWindow = -> - atom.deserializePackageStates() - atom.deserializeProject() - atom.deserializeRootView() - window.onerror = -> atom.openDevTools()