From 8aaf45da843ad1efb06d8b99441da1446edf9c55 Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Sat, 12 Nov 2011 19:45:27 -0800
Subject: [PATCH] rename events: {project,editor}:load => {project,editor}:open

---
 extensions/filefinder/filefinder.coffee |  2 +-
 extensions/tabs/tabs.coffee             |  2 +-
 extensions/tree/tree.coffee             |  2 +-
 src/atom/editor.coffee                  |  4 ++--
 src/atom/project.coffee                 | 18 ++++++++++++------
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/extensions/filefinder/filefinder.coffee b/extensions/filefinder/filefinder.coffee
index 2d40bacaa..69a15fc9c 100644
--- a/extensions/filefinder/filefinder.coffee
+++ b/extensions/filefinder/filefinder.coffee
@@ -5,7 +5,7 @@ module.exports =
 class Filefinder extends Extension
   constructor: ->
     atom.keybinder.load require.resolve "filefinder/key-bindings.coffee"
-    atom.on 'project:load', @startup
+    atom.on 'project:open', @startup
 
   startup: =>
     @pane = new FilefinderPane this
diff --git a/extensions/tabs/tabs.coffee b/extensions/tabs/tabs.coffee
index 01e90aabe..c4f23f745 100644
--- a/extensions/tabs/tabs.coffee
+++ b/extensions/tabs/tabs.coffee
@@ -10,7 +10,7 @@ class Tabs extends Extension
   constructor: ->
     atom.keybinder.load require.resolve "tabs/key-bindings.coffee"
 
-    atom.on 'project:load', @startup
+    atom.on 'project:open', @startup
     atom.on 'project:resource:active', @focus
 
   startup: (@project) =>
diff --git a/extensions/tree/tree.coffee b/extensions/tree/tree.coffee
index d38faba44..17df47ece 100644
--- a/extensions/tree/tree.coffee
+++ b/extensions/tree/tree.coffee
@@ -13,7 +13,7 @@ class Tree extends Extension
 
   constructor: ->
     atom.keybinder.load require.resolve "tree/key-bindings.coffee"
-    atom.on 'project:load', @startup
+    atom.on 'project:open', @startup
 
   startup: (@project) =>
     @pane = new TreePane this
diff --git a/src/atom/editor.coffee b/src/atom/editor.coffee
index f1f08d084..a69cb45f8 100644
--- a/src/atom/editor.coffee
+++ b/src/atom/editor.coffee
@@ -8,7 +8,7 @@ EditorPane = require 'editor-pane'
 {UndoManager} = require 'ace/undomanager'
 
 # Events:
-#   editor:load (editor) -> Called when an editor is loaded.
+#   editor:open (editor) -> Called when an editor is opened.
 module.exports =
 class Editor extends Resource
   window.resourceTypes.push this
@@ -79,7 +79,7 @@ class Editor extends Resource
 
     window.setTitle @title()
     @dirty = false
-    atom.trigger 'editor:load', this
+    atom.trigger 'editor:open', this
 
     true
 
diff --git a/src/atom/project.coffee b/src/atom/project.coffee
index 043fbdaf5..ff5e69a9c 100644
--- a/src/atom/project.coffee
+++ b/src/atom/project.coffee
@@ -4,9 +4,9 @@ fs = require 'fs'
 Resource = require 'resource'
 
 # Events:
-#   project:load (project) -> Called when a project is loaded.
-#   project:resource:load (project, resource) ->
-#     Called when the project loads a resource.
+#   project:open (project) -> Called when a project is opened.
+#   project:resource:open (project, resource) ->
+#     Called when the project opens a resource.
 #   project:resource:active (project, resource) ->
 #     Called when a resource becomes active (i.e. the focal point)
 #     in a project.
@@ -35,7 +35,7 @@ class Project extends Resource
 
       @url = url
       @show()
-      atom.trigger 'project:load', this
+      atom.trigger 'project:open', this
 
       true
     else if @url
@@ -47,7 +47,7 @@ class Project extends Resource
       if (fs.isFile url) and not @childURL url
         return false
 
-      # Is this resource already loaded?
+      # Is this resource already open?
       if @resources[url]
         @activeResource = @resources[url]
         atom.trigger 'project:resource:active', this, @activeResource
@@ -61,13 +61,19 @@ class Project extends Resource
 
         if success
           @resources[url] = @activeResource = resource
-          atom.trigger 'project:resource:load', this, resource
+          atom.trigger 'project:resource:open', this, resource
           atom.trigger 'project:resource:active', this, resource
           true
 
   save: ->
     @activeResource?.save()
 
+  close: ->
+    if @activeResource
+      @activeResource.close()
+    else
+      super
+
   # Determines if a passed URL is a child of @url.
   # Returns a Boolean.
   childURL: (url) ->