From 0c542d2317d4d83c8c100eaa33fa22055cf18863 Mon Sep 17 00:00:00 2001
From: probablycorey <cj@github.com>
Date: Mon, 19 Aug 2013 15:27:58 -0700
Subject: [PATCH] Menu Items only show keyBindings that match the selector
 "body"

---
 keymaps/atom.cson | 4 ++--
 src/keymap.coffee | 4 +++-
 src/window.coffee | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/keymaps/atom.cson b/keymaps/atom.cson
index 665edefee..9578e52bf 100644
--- a/keymaps/atom.cson
+++ b/keymaps/atom.cson
@@ -1,6 +1,4 @@
 'body':
-  'meta-alt-ctrl-s': 'application:run-specs'
-  'meta-,': 'application:show-settings'
   'meta-q': 'application:quit'
   'meta-h': 'application:hide'
   'meta-H': 'application:hide-other-applications'
@@ -9,7 +7,9 @@
   'meta-o': 'application:open'
   'meta-O': 'application:open-dev'
   'meta-m': 'application:minimize'
+  'meta-,': 'application:show-settings'
   'alt-meta-ctrl-m': 'application:zoom'
+  'meta-alt-ctrl-s': 'application:run-specs'
 
   'meta-s': 'core:save'
   'meta-S': 'core:save-as'
diff --git a/src/keymap.coffee b/src/keymap.coffee
index e91ea27f3..f70d4cd1c 100644
--- a/src/keymap.coffee
+++ b/src/keymap.coffee
@@ -163,10 +163,12 @@ class Keymap
 
     [modifiers..., key].join('-')
 
-  toObject: ->
+  toObject: (selector)->
+    body = $('body')
     keyBindingsForCommands = {}
     for bindingSet in @bindingSets
       for keystroke, command of bindingSet.commandsByKeystrokes
+        continue unless selector? and body.is(bindingSet.selector)
         keyBindingsForCommands[command] ?= []
         keyBindingsForCommands[command].push keystroke
 
diff --git a/src/window.coffee b/src/window.coffee
index 72c8dddea..ce1d3881a 100644
--- a/src/window.coffee
+++ b/src/window.coffee
@@ -55,7 +55,7 @@ window.startEditorWindow = ->
   atom.activatePackages()
   keymap.loadUserKeymaps()
   atom.requireUserInitScript()
-  ipc.sendChannel 'keymap-loaded', keymap.toObject()
+  ipc.sendChannel 'keymap-loaded', keymap.toObject('body')
   $(window).on 'unload', -> unloadEditorWindow(); false
   atom.show()
   atom.focus()