github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-17 10:01:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move grammar override assignment into loadStateSync

Browse Source 
Signed-off-by: Max Brunsfeld <maxbrunsfeld@github.com>
This commit is contained in:
Nathan Sobo
2015-10-02 12:54:23 -06:00
parent d0e1505a0f
commit 3d5f6c858d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/atom.coffee
View File

@@ -667,9 +667,6 @@ class Atom extends Model
document.querySelector(@workspaceParentSelectorctor).appendChild(workspaceElement)
deserializeEditorWindow: ->
if grammarOverridesByPath = @state.grammars?.grammarOverridesByPath
@grammars.grammarOverridesByPath = grammarOverridesByPath
@deserializeWorkspace()
loadThemes: ->
@@ -731,6 +728,9 @@ class Atom extends Model
@deserializeTimings.atom = Date.now() - startTime
if grammarOverridesByPath = @state.grammars?.grammarOverridesByPath
@grammars.grammarOverridesByPath = grammarOverridesByPath
@packages.packageStates = @state.packageStates ? {}
startTime = Date.now()