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

Ensure we never load saved window in specs

Browse Source
This commit is contained in:
Corey Johnson & Nathan Sobo
2013-03-21 18:51:32 -06:00
parent f4d339ccac
commit 1ad5327c99
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spec/spec-helper.coffee
View File

@@ -39,6 +39,7 @@ beforeEach ->
atom.atomPackageStates = {}
atom.loadedPackages = []
spyOn(atom, 'saveWindowState')
spyOn(atom, 'getSavedWindowState').andReturn(null)
$native.setWindowState('')
# used to reset keymap after each spec

14
src/app/atom.coffee
View File

@@ -198,14 +198,22 @@ _.extend atom,
windowState
getWindowState: (keyPath) ->
inMemoryState = $native.getWindowState()
inMemoryState = null unless inMemoryState.length > 0
windowState = JSON.parse(inMemoryState ? localStorage[window.location.params.pathToOpen] ? '{}')
windowState = JSON.parse(@getInMemoryWindowState() ? @getSavedWindowState() ? '{}')
if keyPath
_.valueForKeyPath(windowState, keyPath)
else
windowState
getInMemoryWindowState: ->
inMemoryState = $native.getWindowState()
if inMemoryState.length > 0
inMemoryState
else
null
getSavedWindowState: ->
localStorage[window.location.params.pathToOpen]
saveWindowState: ->
localStorage[@getPathToOpen()] = JSON.stringify(@getWindowState())