From 25041a49da61a5ec13d96ae0df3e77fc7368b7bd Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Sat, 26 Nov 2011 03:24:38 -0800
Subject: [PATCH] window.close() calls resource.close()

this is similar to resource.open(). the return value
of resource.close() determines whether window should
stop or bubble it up to app.close()
---
 src/atom/key-bindings.coffee |  2 +-
 src/atom/window.coffee       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/atom/key-bindings.coffee b/src/atom/key-bindings.coffee
index 4d5a70c34..66842552a 100644
--- a/src/atom/key-bindings.coffee
+++ b/src/atom/key-bindings.coffee
@@ -5,6 +5,7 @@ app:
 window:
   'cmd-shift-I': (window) -> window.showConsole()
   'cmd-r': (window) -> window.reload()
+  'cmd-w': (window) -> window.close()
   'cmd-o': (window) -> window.open()
   'cmd-O': (window) -> window.open window.prompt "Open URL:"
   'cmd-s': (window) -> window.save()
@@ -15,7 +16,6 @@ window:
     s.src = 'http://erkie.github.com/asteroids.min.js'
 
 editor:
-  'cmd-w': 'close'
   'cmd-shift-s': 'saveAs'
   'cmd-c': 'copy'
   'cmd-x': 'cut'
diff --git a/src/atom/window.coffee b/src/atom/window.coffee
index 1c81afb5f..d47e60949 100644
--- a/src/atom/window.coffee
+++ b/src/atom/window.coffee
@@ -22,6 +22,7 @@ windowAdditions =
     throw "I DON'T KNOW ABOUT #{@url}" if not success
 
   shutdown: ->
+    $atomController.close
 
   showConsole: ->
     $atomController.webView.inspector.showConsole true
@@ -30,20 +31,19 @@ windowAdditions =
     $atomController.window.title = title
 
   reload: ->
-    @close()
+    @shutdown()
     OSX.NSApp.createController @url
 
   open: (url) ->
     url = atom.native.openPanel() unless url
     (@resource.open url) or atom.app.open url
 
+  close: ->
+    @resource.close() or @shutdown()
+
   save: ->
     @resource.save()
 
-  close: (url) ->
-    @shutdown()
-    $atomController.close
-
   handleKeyEvent: ->
     atom.keybinder.handleEvent arguments...