github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wl-electron-35

Browse Source
This commit is contained in:
Max Brunsfeld
2016-02-16 13:16:13 -08:00
parent 81c15bd8b4 cfab689de1
commit 4bc969d1df
24 changed files with 426 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/initialize-application-window.coffee
View File

@@ -23,12 +23,12 @@ module.exports = ({blobStore}) ->
enablePersistence: true
})
atom.loadStateSync()
atom.displayWindow().then ->
atom.startEditorWindow()
atom.loadState().then ->
atom.displayWindow().then ->
atom.startEditorWindow()
# Workaround for focus getting cleared upon window creation
windowFocused = ->
window.removeEventListener('focus', windowFocused)
setTimeout (-> document.querySelector('atom-workspace').focus()), 0
window.addEventListener('focus', windowFocused)
# Workaround for focus getting cleared upon window creation
windowFocused = ->
window.removeEventListener('focus', windowFocused)
setTimeout (-> document.querySelector('atom-workspace').focus()), 0
window.addEventListener('focus', windowFocused)