From eb5e5b8258610effb0586b0d24061aa289a1fb1b Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Wed, 9 Nov 2011 13:59:17 -0800 Subject: [PATCH] /static dir can be loaded by require now. --- src/require.coffee | 1 + src/window.coffee | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/require.coffee b/src/require.coffee index 7e81488ed..1e7e2cc97 100644 --- a/src/require.coffee +++ b/src/require.coffee @@ -7,6 +7,7 @@ else resourcePath = OSX.NSBundle.mainBundle.resourcePath paths = [ + "#{resourcePath}/static" "#{resourcePath}/src" "#{resourcePath}/extensions" "#{resourcePath}/vendor" diff --git a/src/window.coffee b/src/window.coffee index 765a459e2..a9f570af3 100644 --- a/src/window.coffee +++ b/src/window.coffee @@ -80,7 +80,7 @@ windowAdditions = Event.trigger 'extensions:loaded' loadKeyBindings: -> - KeyBinder.load "#{@appRoot}/static/key-bindings.coffee" + KeyBinder.load require.resolve "key-bindings.coffee" if fs.isFile "~/.atomicity/key-bindings.coffee" KeyBinder.load "~/.atomicity/key-bindings.coffee"