From 9db7eb1c0d0dde23b61ac9b59459c7c3d2cd492b Mon Sep 17 00:00:00 2001 From: Chris Wanstrath Date: Wed, 9 Nov 2011 12:32:54 -0800 Subject: [PATCH] atom.on, atom.off, atom.trigger --- extensions/gemfile/gemfile.coffee | 2 +- extensions/tabs/tabs.coffee | 8 ++++---- src/browser.coffee | 4 ++-- src/editor.coffee | 12 ++++++------ src/modal.coffee | 4 ++-- src/startup.coffee | 6 +++++- src/window.coffee | 8 ++++---- 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/extensions/gemfile/gemfile.coffee b/extensions/gemfile/gemfile.coffee index 792668a4c..b1c5a2a17 100644 --- a/extensions/gemfile/gemfile.coffee +++ b/extensions/gemfile/gemfile.coffee @@ -9,7 +9,7 @@ Watcher = require 'watcher' module.exports = class Gemfile extends Extension constructor: -> - atom.event.on 'extensions:loaded', @addRubyGemsDir + atom.on 'extensions:loaded', @addRubyGemsDir addRubyGemsDir: => paths = window.extensions.Tree.paths diff --git a/extensions/tabs/tabs.coffee b/extensions/tabs/tabs.coffee index 925be2503..d3a7376c4 100644 --- a/extensions/tabs/tabs.coffee +++ b/extensions/tabs/tabs.coffee @@ -13,19 +13,19 @@ class Tabs extends Extension @pane = new TabsPane @ - atom.event.on 'editor:bufferAdd', (e) => + atom.on 'editor:bufferAdd', (e) => path = e.details @pane.addTab path - atom.event.on 'editor:bufferFocus', (e) => + atom.on 'editor:bufferFocus', (e) => path = e.details @pane.addTab path - atom.event.on 'editor:bufferRemove', (e) => + atom.on 'editor:bufferRemove', (e) => path = e.details @pane.removeTab path - atom.event.on 'browser:focus', (e) => + atom.on 'browser:focus', (e) => path = e.details @pane.addTab path diff --git a/src/browser.coffee b/src/browser.coffee index 633623ef1..ea1747bb5 100644 --- a/src/browser.coffee +++ b/src/browser.coffee @@ -14,7 +14,7 @@ class Browser extends Pane /^https?:\/\//.test path constructor: -> - atom.event.on "window:open", (e) => + atom.on "window:open", (e) => path = e.details return unless @constructor.isPathUrl path @@ -24,4 +24,4 @@ class Browser extends Pane @show() - atom.event.trigger "browser:focus", path + atom.trigger "browser:focus", path diff --git a/src/editor.coffee b/src/editor.coffee index 64721d15e..3ccd996d5 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -36,12 +36,12 @@ class Editor extends Pane @ace.setShowInvisibles(true) @ace.setPrintMarginColumn 78 - atom.event.on 'window:open', (e) => + atom.on 'window:open', (e) => path = e.details @addBuffer e.details if fs.isFile path - atom.event.on 'window:close', (e) => @removeBuffer e.details - atom.event.on 'editor:bufferFocus', (e) => @resize() + atom.on 'window:close', (e) => @removeBuffer e.details + atom.on 'editor:bufferFocus', (e) => @resize() # Resize editor when panes are added/removed el = document.body @@ -109,7 +109,7 @@ class Editor extends Pane atom.storage.set @openPathsKey, openPaths buffer.on 'change', -> buffer.$atom_dirty = true - atom.event.trigger "editor:bufferAdd", path + atom.trigger "editor:bufferAdd", path @focusBuffer path @@ -142,7 +142,7 @@ class Editor extends Pane openPaths = atom.storage.get @openPathsKey, [] atom.storage.set @openPathsKey, _.without openPaths, path - atom.event.trigger "editor:bufferRemove", path + atom.trigger "editor:bufferRemove", path if path is @activePath newActivePath = Object.keys(@buffers)[0] @@ -161,7 +161,7 @@ class Editor extends Pane @ace.setSession buffer atom.storage.set @focusedPathKey, path - atom.event.trigger "editor:bufferFocus", path + atom.trigger "editor:bufferFocus", path save: (path) -> path ?= @activePath diff --git a/src/modal.coffee b/src/modal.coffee index fb0b1b89a..c5af12350 100644 --- a/src/modal.coffee +++ b/src/modal.coffee @@ -35,7 +35,7 @@ class Modal $('#modal input').focus() @resize() - atom.event.trigger 'modal:show', @ + atom.trigger 'modal:show', @ resize: -> $('#modal').css @@ -48,7 +48,7 @@ class Modal $('#modal-overlay').fadeOut 200, -> $(this).remove() $(document).unbind '.modal' $(window).unbind '.modal' - atom.event.trigger 'modal:hide', @ + atom.trigger 'modal:hide', @ toggle: -> if @showing then @hide() else @show() diff --git a/src/startup.coffee b/src/startup.coffee index f27dfffa8..2381b9bea 100644 --- a/src/startup.coffee +++ b/src/startup.coffee @@ -8,8 +8,12 @@ Storage = require 'storage' window.atom = {} window.atom.native = new Native -window.atom.event = new Event window.atom.keybinder = new KeyBinder window.atom.storage = new Storage +window.atom.event = new Event +# atom.on, atom.off, etc. +for name, method of window.atom.event + window.atom[name] = window.atom.event[name] + window.atom.app = new App diff --git a/src/window.coffee b/src/window.coffee index a97828899..e18889104 100644 --- a/src/window.coffee +++ b/src/window.coffee @@ -72,7 +72,7 @@ windowAdditions = console.warn "window: Extension #{extension.constructor.name} failed to startup." console.warn error - atom.event.trigger 'extensions:loaded' + atom.trigger 'extensions:loaded' loadKeyBindings: -> atom.keybinder.load "#{@appRoot}/static/key-bindings.coffee" @@ -96,18 +96,18 @@ windowAdditions = open: (path) -> $atomController.window.makeKeyAndOrderFront $atomController - atom.event.trigger 'window:open', path + atom.trigger 'window:open', path close: (path) -> @shutdown() $atomController.close - atom.event.trigger 'window:close', path + atom.trigger 'window:close', path handleKeyEvent: -> atom.keybinder.handleEvent.apply atom.keybinder, arguments triggerEvent: -> - atom.event.trigger arguments... + atom.trigger arguments... canOpen: (path) -> parent = @path.replace(/([^\/])$/, "$1/")