From 11866b90fe3e17588044957d7167b44e3d3b76fb Mon Sep 17 00:00:00 2001
From: Corey Johnson & Nathan Sobo <domaingithub.com>
Date: Tue, 10 Jan 2012 16:06:14 -0800
Subject: [PATCH] Rename KeyEventHandler to GlobalKeymap

---
 extensions/dotatom/index.coffee                  |  2 +-
 extensions/tabs/tabs.coffee                      |  2 +-
 ...ler-spec.coffee => global-keymap-spec.coffee} |  6 +++---
 spec/atom/root-view-spec.coffee                  |  2 +-
 ...event-handler.coffee => global-keymap.coffee} |  2 +-
 src/atom/root-view.coffee                        | 16 +++++++++-------
 src/stdlib/child-process.coffee                  |  2 +-
 src/stdlib/storage.coffee                        |  2 +-
 8 files changed, 18 insertions(+), 16 deletions(-)
 rename spec/atom/{key-event-handler-spec.coffee => global-keymap-spec.coffee} (96%)
 rename src/atom/{key-event-handler.coffee => global-keymap.coffee} (97%)

diff --git a/extensions/dotatom/index.coffee b/extensions/dotatom/index.coffee
index 6fb484f41..47f47fa77 100644
--- a/extensions/dotatom/index.coffee
+++ b/extensions/dotatom/index.coffee
@@ -9,4 +9,4 @@ class Dotatom
       console.log 'No ~/.atom module found.'
 
     atom.settings.load "~/.atom/settings.coffee"
-    atom.keybinder.load "~/.atom/key-bindings.coffee"
\ No newline at end of file
+    atom.keybinder.load "~/.atom/key-bindings.coffee"
diff --git a/extensions/tabs/tabs.coffee b/extensions/tabs/tabs.coffee
index 38c25d10d..166fcd9d0 100644
--- a/extensions/tabs/tabs.coffee
+++ b/extensions/tabs/tabs.coffee
@@ -28,4 +28,4 @@ class Tabs extends Extension
     @pane?.addTab resource.url
 
   close: (project, resource) =>
-    @pane?.removeTab resource.url
\ No newline at end of file
+    @pane?.removeTab resource.url
diff --git a/spec/atom/key-event-handler-spec.coffee b/spec/atom/global-keymap-spec.coffee
similarity index 96%
rename from spec/atom/key-event-handler-spec.coffee
rename to spec/atom/global-keymap-spec.coffee
index bc722ef46..037e68cfc 100644
--- a/spec/atom/key-event-handler-spec.coffee
+++ b/spec/atom/global-keymap-spec.coffee
@@ -1,11 +1,11 @@
-KeyEventHandler = require 'key-event-handler'
+GlobalKeymap = require 'global-keymap'
 $ = require 'jquery'
 
-describe "KeyEventHandler", ->
+describe "GlobalKeymap", ->
   handler = null
 
   beforeEach ->
-    handler = new KeyEventHandler
+    handler = new GlobalKeymap
 
   describe "handleKeyEvent", ->
     fragment = null
diff --git a/spec/atom/root-view-spec.coffee b/spec/atom/root-view-spec.coffee
index 7909c72f7..d304e511a 100644
--- a/spec/atom/root-view-spec.coffee
+++ b/spec/atom/root-view-spec.coffee
@@ -83,7 +83,7 @@ describe "RootView", ->
 
   describe "when a key is typed in the editor that has a binding in the keymap", ->
     it "triggers the key binding's command as an event and does not insert a character", ->
-      rootView.keyEventHandler.bindKeys('.editor', 'x': 'fooCommand')
+      rootView.globalKeymap.bindKeys('.editor', 'x': 'fooCommand')
 
       fooCommandHandler = jasmine.createSpy('fooCommandHandler')
       rootView.editor.on('fooCommand', fooCommandHandler)
diff --git a/src/atom/key-event-handler.coffee b/src/atom/global-keymap.coffee
similarity index 97%
rename from src/atom/key-event-handler.coffee
rename to src/atom/global-keymap.coffee
index 3e0c699d7..c5703e466 100644
--- a/src/atom/key-event-handler.coffee
+++ b/src/atom/global-keymap.coffee
@@ -3,7 +3,7 @@ BindingSet = require 'binding-set'
 Specificity = require 'specificity'
 
 module.exports =
-class KeyEventHandler
+class GlobalKeymap
   bindingSetsBySelector: null
 
   constructor: ->
diff --git a/src/atom/root-view.coffee b/src/atom/root-view.coffee
index 708ac65d3..376159c3b 100644
--- a/src/atom/root-view.coffee
+++ b/src/atom/root-view.coffee
@@ -6,7 +6,7 @@ Buffer = require 'buffer'
 Editor = require 'editor'
 FileFinder = require 'file-finder'
 Project = require 'project'
-KeyEventHandler = require 'key-event-handler'
+GlobalKeymap = require 'global-keymap'
 
 module.exports =
 class RootView extends Template
@@ -18,14 +18,16 @@ class RootView extends Template
           @subview 'editor', Editor.build()
 
   viewProperties:
-    keyEventHandler: null
+    globalKeymap: null
 
     initialize: ({url}) ->
-      @keyEventHandler = new KeyEventHandler
-      @editor.keyEventHandler = @keyEventHandler
-      @bindKey 'meta+s', => @editor.save()
-      @bindKey 'meta+w', => window.close()
-      @bindKey 'meta+t', => @toggleFileFinder()
+      @globalKeymap = new GlobalKeymap
+      @globalKeymap.bindKeys '*'
+        'meta+s': 'save'
+        'meta+w': 'close'
+        'meta+t': 'find-files'
+
+      @editor.keyEventHandler = @globalKeymap
 
       if url
         @project = new Project(fs.directory(url))
diff --git a/src/stdlib/child-process.coffee b/src/stdlib/child-process.coffee
index 813f09a4d..a724439e0 100644
--- a/src/stdlib/child-process.coffee
+++ b/src/stdlib/child-process.coffee
@@ -47,4 +47,4 @@ module.exports =
     OSX.NSString.
     alloc.
     initWithData_encoding(handle.readDataToEndOfFile, OSX.NSUTF8StringEncoding).
-    toString()
\ No newline at end of file
+    toString()
diff --git a/src/stdlib/storage.coffee b/src/stdlib/storage.coffee
index 9dfe8631b..9a3334b29 100644
--- a/src/stdlib/storage.coffee
+++ b/src/stdlib/storage.coffee
@@ -36,4 +36,4 @@ class Storage
       array.push @toJS v for v in value
       array
     else
-      value.valueOf()
\ No newline at end of file
+      value.valueOf()