From f5ecaf436e4a2e5cd1598c74f2483a671c3588c1 Mon Sep 17 00:00:00 2001
From: Corey Johnson & Nathan Sobo <cj+nathan@github.com>
Date: Wed, 20 Feb 2013 09:58:34 -0800
Subject: [PATCH] Move core:close into handleWindowEvents

---
 spec/spec-helper.coffee |  3 +--
 src/app/window.coffee   | 15 +++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 85ff73c57..98800c830 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -64,8 +64,7 @@ afterEach ->
   ensureNoPathSubscriptions()
   waits(0) # yield to ui thread to make screen update more frequently
 
-# window.keymap.bindKeys '*', 'meta-w': 'close'
-$(document).on 'close', -> window.close()
+$(window).on 'core:close', -> window.close()
 $(window).on 'toggle-dev-tools', (e) -> atom.toggleDevTools()
 $('html,body').css('overflow', 'auto')
 
diff --git a/src/app/window.coffee b/src/app/window.coffee
index c3152c7e6..2c9ff425b 100644
--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -30,14 +30,6 @@ windowAdditions =
     $(document).on 'keydown', keymap.handleKeyEvent
     keymap.bindDefaultKeys()
 
-    $(window).on 'core:close', => window.close()
-
-  handleWindowEvents: ->
-    $(window).command 'window:close', => window.close()
-    $(window).command 'window:toggle-full-screen', => atom.toggleFullScreen()
-    $(window).on 'focus', -> $("body").removeClass('is-blurred')
-    $(window).on 'blur',  -> $("body").addClass('is-blurred')
-
   # This method is intended only to be run when starting a normal application
   # Note: RootView assigns itself on window on initialization so that
   # window.rootView is available when loading user configuration
@@ -56,6 +48,13 @@ windowAdditions =
     pathToOpen = atom.getPathToOpen()
     rootView.open(pathToOpen) if !pathToOpen or fs.isFile(pathToOpen)
 
+  handleWindowEvents: ->
+    $(window).on 'core:close', => window.close()
+    $(window).command 'window:close', => window.close()
+    $(window).command 'window:toggle-full-screen', => atom.toggleFullScreen()
+    $(window).on 'focus', -> $("body").removeClass('is-blurred')
+    $(window).on 'blur',  -> $("body").addClass('is-blurred')
+
   buildProjectAndRootView: ->
     RootView = require 'root-view'
     Project = require 'project'