Only unload editor window when confirmed

brixen · Aug 12, 2014 · 97c2fc0 · 97c2fc0
1 parent 16d2e41
commit 97c2fc0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/atom.coffee b/src/atom.coffee
@@ -311,11 +311,6 @@ class Atom extends Model
     @requireUserInitScript()
     @menu.update()
 
-    $(window).on 'beforeunload', =>
-      $(document.body).css('visibility', 'hidden')
-      @unloadEditorWindow()
-      null
-
     @displayWindow()
 
   unloadEditorWindow: ->

diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee
@@ -35,15 +35,17 @@ class WindowEventHandler
       confirmed = atom.workspaceView?.confirmClose()
       atom.hide() if confirmed and not @reloadRequested and atom.getCurrentWindow().isWebViewFocused()
       @reloadRequested = false
-      confirmed
 
-    @subscribe $(window), 'blur beforeunload', ->
       atom.storeDefaultWindowDimensions()
-      null
-
-    @subscribe $(window), 'beforeunload', ->
       atom.storeWindowDimensions()
-      null
+
+      if confirmed
+        $(document.body).css('visibility', 'hidden')
+        atom.unloadEditorWindow()
+
+      confirmed
+
+    @subscribe $(window), 'blur', -> atom.storeDefaultWindowDimensions()
 
     @subscribeToCommand $(window), 'window:toggle-full-screen', -> atom.toggleFullScreen()