From 96aaefdd7d697fe8b0e712a858a72e70a89e0c4b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki & Nathan Sobo Date: Fri, 4 Jan 2013 13:45:49 -0700 Subject: [PATCH] Rename `Project` events to be past-tense --- spec/app/project-spec.coffee | 12 ++++++------ src/app/project.coffee | 6 +++--- .../src/strip-trailing-whitespace.coffee | 2 +- src/packages/tree-view/src/tree-view.coffee | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spec/app/project-spec.coffee b/spec/app/project-spec.coffee index 40d8bf115..9b8b7312c 100644 --- a/spec/app/project-spec.coffee +++ b/spec/app/project-spec.coffee @@ -28,26 +28,26 @@ describe "Project", -> beforeEach -> absolutePath = require.resolve('fixtures/dir/a') newBufferHandler = jasmine.createSpy('newBufferHandler') - project.on 'new-buffer', newBufferHandler + project.on 'buffer-created', newBufferHandler newEditSessionHandler = jasmine.createSpy('newEditSessionHandler') - project.on 'new-edit-session', newEditSessionHandler + project.on 'edit-session-created', newEditSessionHandler describe "when given an absolute path that hasn't been opened previously", -> - it "returns a new edit session for the given path and emits 'new-buffer' and 'new-edit-session' events", -> + it "returns a new edit session for the given path and emits 'buffer-created' and 'edit-session-created' events", -> editSession = project.buildEditSessionForPath(absolutePath) expect(editSession.buffer.getPath()).toBe absolutePath expect(newBufferHandler).toHaveBeenCalledWith editSession.buffer expect(newEditSessionHandler).toHaveBeenCalledWith editSession describe "when given a relative path that hasn't been opened previously", -> - it "returns a new edit session for the given path (relative to the project root) and emits 'new-buffer' and 'new-edit-session' events", -> + it "returns a new edit session for the given path (relative to the project root) and emits 'buffer-created' and 'edit-session-created' events", -> editSession = project.buildEditSessionForPath('a') expect(editSession.buffer.getPath()).toBe absolutePath expect(newBufferHandler).toHaveBeenCalledWith editSession.buffer expect(newEditSessionHandler).toHaveBeenCalledWith editSession describe "when passed the path to a buffer that has already been opened", -> - it "returns a new edit session containing previously opened buffer and emits a 'new-edit-session' event", -> + it "returns a new edit session containing previously opened buffer and emits a 'edit-session-created' event", -> editSession = project.buildEditSessionForPath(absolutePath) newBufferHandler.reset() expect(project.buildEditSessionForPath(absolutePath).buffer).toBe editSession.buffer @@ -56,7 +56,7 @@ describe "Project", -> expect(newEditSessionHandler).toHaveBeenCalledWith editSession describe "when not passed a path", -> - it "returns a new edit session and emits 'new-buffer' and 'new-edit-session' events", -> + it "returns a new edit session and emits 'buffer-created' and 'edit-session-created' events", -> editSession = project.buildEditSessionForPath() expect(editSession.buffer.getPath()).toBeUndefined() expect(newBufferHandler).toHaveBeenCalledWith(editSession.buffer) diff --git a/src/app/project.coffee b/src/app/project.coffee index 094e88b5d..2d968a4fc 100644 --- a/src/app/project.coffee +++ b/src/app/project.coffee @@ -41,7 +41,7 @@ class Project else @rootDirectory = null - @trigger "path-change" + @trigger "path-changed" getRootDirectory: -> @rootDirectory @@ -88,7 +88,7 @@ class Project options.buffer = buffer editSession = new EditSession(options) @editSessions.push editSession - @trigger 'new-edit-session', editSession + @trigger 'edit-session-created', editSession editSession defaultEditSessionOptions: -> @@ -124,7 +124,7 @@ class Project buildBuffer: (filePath) -> buffer = new Buffer(filePath, this) @buffers.push buffer - @trigger 'new-buffer', buffer + @trigger 'buffer-created', buffer buffer removeBuffer: (buffer) -> diff --git a/src/packages/strip-trailing-whitespace/src/strip-trailing-whitespace.coffee b/src/packages/strip-trailing-whitespace/src/strip-trailing-whitespace.coffee index 2079a1edc..f0f784c1b 100644 --- a/src/packages/strip-trailing-whitespace/src/strip-trailing-whitespace.coffee +++ b/src/packages/strip-trailing-whitespace/src/strip-trailing-whitespace.coffee @@ -5,7 +5,7 @@ module.exports = for buffer in rootView.project.getBuffers() @stripTrailingWhitespaceBeforeSave(buffer) - rootView.project.on 'new-buffer', (buffer) => + rootView.project.on 'buffer-created', (buffer) => @stripTrailingWhitespaceBeforeSave(buffer) stripTrailingWhitespaceBeforeSave: (buffer) -> diff --git a/src/packages/tree-view/src/tree-view.coffee b/src/packages/tree-view/src/tree-view.coffee index 83ba128d3..7f8470b7c 100644 --- a/src/packages/tree-view/src/tree-view.coffee +++ b/src/packages/tree-view/src/tree-view.coffee @@ -62,7 +62,7 @@ class TreeView extends ScrollView @rootView.command 'tree-view:toggle', => @toggle() @rootView.command 'tree-view:reveal-active-file', => @revealActiveFile() @rootView.on 'root-view:active-path-changed', => @selectActiveFile() - @rootView.project.on 'path-change', => @updateRoot() + @rootView.project.on 'path-changed', => @updateRoot() @observeConfig 'core.hideGitIgnoredFiles', => @updateRoot() @selectEntry(@root) if @root