From e9bbc37547a947b694b399446a7fb2862998ea83 Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Mon, 21 Nov 2011 22:10:56 -0800
Subject: [PATCH] automatically load extension/key-bindings.coffee

---
 extensions/docs/docs.coffee                       | 3 ---
 extensions/filefinder/filefinder.coffee           | 1 -
 extensions/gemfile/gemfile.coffee                 | 1 -
 extensions/markdownpreview/markdownpreview.coffee | 3 ---
 extensions/projectfinder/projectfinder.coffee     | 1 -
 extensions/showkeybindings/showkeybindings.coffee | 1 -
 extensions/tabs/tabs.coffee                       | 2 --
 extensions/tree/tree.coffee                       | 1 -
 src/atom/extension-manager.coffee                 | 1 +
 src/stdlib/key-binder.coffee                      | 3 +++
 10 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/extensions/docs/docs.coffee b/extensions/docs/docs.coffee
index 6621067d5..cb8ba1b2f 100644
--- a/extensions/docs/docs.coffee
+++ b/extensions/docs/docs.coffee
@@ -10,9 +10,6 @@ class Docs extends Browser
 
   running: true
 
-  constructor: ->
-    atom.keybinder.load require.resolve "docs/key-bindings.coffee"
-
   open: (url) ->
     return false if not url
 
diff --git a/extensions/filefinder/filefinder.coffee b/extensions/filefinder/filefinder.coffee
index a08493a3c..7d599184b 100644
--- a/extensions/filefinder/filefinder.coffee
+++ b/extensions/filefinder/filefinder.coffee
@@ -7,7 +7,6 @@ ModalSelector = require 'modal-selector'
 module.exports =
 class Filefinder extends Extension
   constructor: ->
-    atom.keybinder.load require.resolve "filefinder/key-bindings.coffee"
     atom.on 'project:open', @startup
 
   startup: (@project) =>
diff --git a/extensions/gemfile/gemfile.coffee b/extensions/gemfile/gemfile.coffee
index d54d4ac10..0326760a0 100644
--- a/extensions/gemfile/gemfile.coffee
+++ b/extensions/gemfile/gemfile.coffee
@@ -8,7 +8,6 @@ ModalSelector = require 'modal-selector'
 module.exports =
 class Gemfile extends Extension
   constructor: ->
-    atom.keybinder.load require.resolve "gemfile/key-bindings.coffee"
     atom.on 'project:open', @startup
 
   startup: (@project) =>
diff --git a/extensions/markdownpreview/markdownpreview.coffee b/extensions/markdownpreview/markdownpreview.coffee
index 789860922..4b6d7c9dd 100644
--- a/extensions/markdownpreview/markdownpreview.coffee
+++ b/extensions/markdownpreview/markdownpreview.coffee
@@ -13,9 +13,6 @@ class Markdownpreview extends Browser
 
   running: true
 
-  constructor: ->
-    atom.keybinder.load require.resolve "markdownpreview/key-bindings.coffee"
-
   open: (url) ->
     return false if not url
 
diff --git a/extensions/projectfinder/projectfinder.coffee b/extensions/projectfinder/projectfinder.coffee
index 4a7f7751f..975a192b5 100644
--- a/extensions/projectfinder/projectfinder.coffee
+++ b/extensions/projectfinder/projectfinder.coffee
@@ -10,7 +10,6 @@ class Projectfinder extends Extension
     root: "~/Code"
 
   constructor: ->
-    atom.keybinder.load require.resolve "projectfinder/key-bindings.coffee"
     atom.on 'window:load', @startup
 
   startup: (@project) =>
diff --git a/extensions/showkeybindings/showkeybindings.coffee b/extensions/showkeybindings/showkeybindings.coffee
index b65f6682a..fea44e28f 100644
--- a/extensions/showkeybindings/showkeybindings.coffee
+++ b/extensions/showkeybindings/showkeybindings.coffee
@@ -9,7 +9,6 @@ class Showkeybindings extends Browser
   window.resourceTypes.push this
 
   constructor: ->
-    atom.keybinder.load require.resolve "showkeybindings/key-bindings.coffee"
     @running = true
 
   open: (url) ->
diff --git a/extensions/tabs/tabs.coffee b/extensions/tabs/tabs.coffee
index c4f23f745..2659179de 100644
--- a/extensions/tabs/tabs.coffee
+++ b/extensions/tabs/tabs.coffee
@@ -8,8 +8,6 @@ class Tabs extends Extension
   project: null
 
   constructor: ->
-    atom.keybinder.load require.resolve "tabs/key-bindings.coffee"
-
     atom.on 'project:open', @startup
     atom.on 'project:resource:active', @focus
 
diff --git a/extensions/tree/tree.coffee b/extensions/tree/tree.coffee
index 206f4ca5e..97090ff93 100644
--- a/extensions/tree/tree.coffee
+++ b/extensions/tree/tree.coffee
@@ -10,7 +10,6 @@ class Tree extends Extension
   project: null
 
   constructor: ->
-    atom.keybinder.load require.resolve "tree/key-bindings.coffee"
     atom.on 'project:open', @startup
 
   startup: (@project) =>
diff --git a/src/atom/extension-manager.coffee b/src/atom/extension-manager.coffee
index 9abbddd8b..75e8bbbb6 100644
--- a/src/atom/extension-manager.coffee
+++ b/src/atom/extension-manager.coffee
@@ -15,6 +15,7 @@ class ExtensionManager
       try
         extension = require extensionPath
         atom.extensions[extension.name] = new extension
+        atom.keybinder.load "#{extensionPath}/key-bindings.coffee"
       catch error
         console.warn "Loading Extension '#{fs.base extensionPath}' failed."
         console.warn error
diff --git a/src/stdlib/key-binder.coffee b/src/stdlib/key-binder.coffee
index 454285a4a..b5d1245ec 100644
--- a/src/stdlib/key-binder.coffee
+++ b/src/stdlib/key-binder.coffee
@@ -16,6 +16,9 @@ class KeyBinder
   register: (name, scope) ->
 
   load: (path) ->
+    path = require.resolve path
+    return if not fs.isFile path
+
     try
 #       Watcher.watch path, =>
 #         @load path