From 766f301bc112b7a935916889f31e4c84de8af53b Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Wed, 11 Jan 2012 11:00:16 -0800 Subject: [PATCH] atom.bindKey calls RootView.bindKey --- src/atom/app.coffee | 3 +++ src/atom/root-view.coffee | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/atom/app.coffee b/src/atom/app.coffee index a91af243c..37fd07187 100644 --- a/src/atom/app.coffee +++ b/src/atom/app.coffee @@ -7,6 +7,9 @@ class App constructor: -> @native = new Native + bindKeys: (selector, bindings) -> + window.rootView.bindKeys(selector, bindings) + open: (url) -> OSX.NSApp.open url diff --git a/src/atom/root-view.coffee b/src/atom/root-view.coffee index 10627feb0..55ae3ec1c 100644 --- a/src/atom/root-view.coffee +++ b/src/atom/root-view.coffee @@ -1,5 +1,6 @@ $ = require 'jquery' fs = require 'fs' +_ = require 'underscore' Template = require 'template' Buffer = require 'buffer' @@ -21,21 +22,30 @@ class RootView extends Template globalKeymap: null initialize: ({url}) -> - @globalKeymap = new GlobalKeymap - @on 'keydown', (e) => @globalKeymap.handleKeyEvent(e) - @editor.keyEventHandler = @globalKeymap + @createGlobalKeymap() + @createProject(url) - @globalKeymap.bindKeys '*' + @bindKeys '*' 'meta-s': 'save' 'meta-w': 'close' 'meta-t': 'toggle-file-finder' @on 'toggle-file-finder', => @toggleFileFinder() + + createGlobalKeymap: -> + @globalKeymap = new GlobalKeymap + @on 'keydown', (e) => @globalKeymap.handleKeyEvent(e) + @editor.keyEventHandler = @globalKeymap + + createProject: (url) -> if url @project = new Project(fs.directory(url)) @editor.setBuffer(@project.open(url)) if fs.isFile(url) + bindKeys: (selector, bindings) -> + @globalKeymap.bindKeys(selector, bindings) + addPane: (view) -> pane = $('
') pane.append(view)