diff --git a/spec/app/buffer-spec.coffee b/spec/app/buffer-spec.coffee index a009797af..525aa61d0 100644 --- a/spec/app/buffer-spec.coffee +++ b/spec/app/buffer-spec.coffee @@ -116,13 +116,13 @@ describe 'Buffer', -> describe "when the buffer's memory contents differ from the *previous* disk contents", -> it "leaves the buffer in a modified state (does not update its memory contents)", -> fileChangeHandler = jasmine.createSpy('fileChange') - buffer.file.on 'contents-change', fileChangeHandler + buffer.file.on 'contents-changed', fileChangeHandler buffer.insert([0, 0], "a change") fs.write(path, "second") expect(fileChangeHandler.callCount).toBe 0 - waitsFor "file to trigger contents-change event", -> + waitsFor "file to trigger 'contents-changed' event", -> fileChangeHandler.callCount > 0 runs -> diff --git a/spec/app/directory-spec.coffee b/spec/app/directory-spec.coffee index f42f65a34..d33341623 100644 --- a/spec/app/directory-spec.coffee +++ b/spec/app/directory-spec.coffee @@ -20,12 +20,12 @@ describe "Directory", -> afterEach -> fs.remove(temporaryFilePath) if fs.exists(temporaryFilePath) - it "triggers 'contents-change' event handlers", -> + it "triggers 'contents-changed' event handlers", -> changeHandler = null runs -> changeHandler = jasmine.createSpy('changeHandler') - directory.on 'contents-change', changeHandler + directory.on 'contents-changed', changeHandler fs.write(temporaryFilePath, '') waitsFor "first change", -> changeHandler.callCount > 0 @@ -51,7 +51,7 @@ describe "Directory", -> runs -> changeHandler = jasmine.createSpy('changeHandler') - directory.on 'contents-change', changeHandler + directory.on 'contents-changed', changeHandler fs.write(temporaryFilePath, '') waitsFor "change event", -> changeHandler.callCount > 0 diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee index b11102f3e..57c3b34c1 100644 --- a/spec/app/editor-spec.coffee +++ b/spec/app/editor-spec.coffee @@ -126,13 +126,13 @@ describe "Editor", -> editor.insertText("now the buffer is modified") fileChangeHandler = jasmine.createSpy('fileChange') - editSession.buffer.file.on 'contents-change', fileChangeHandler + editSession.buffer.file.on 'contents-changed', fileChangeHandler spyOn(atom, "confirm") fs.write(path, "a file change") - waitsFor "file to trigger contents-change event", -> + waitsFor "file to trigger contents-changed event", -> fileChangeHandler.callCount > 0 runs -> @@ -287,7 +287,7 @@ describe "Editor", -> fs.write(path, "a file change") - waitsFor "file to trigger contents-change event", (done) -> + waitsFor "file to trigger contents-changed event", (done) -> editSession.one 'contents-conflicted', done runs -> @@ -1992,11 +1992,11 @@ describe "Editor", -> editor.save() fileChangeHandler = jasmine.createSpy('fileChange') - editor.getBuffer().file.on 'contents-change', fileChangeHandler + editor.getBuffer().file.on 'contents-changed', fileChangeHandler editor.checkoutHead() - waitsFor "file to trigger contents-change event", -> + waitsFor "file to trigger contents-changed event", -> fileChangeHandler.callCount > 0 runs -> diff --git a/spec/app/file-spec.coffee b/spec/app/file-spec.coffee index 625ac96a2..60a0f653b 100644 --- a/spec/app/file-spec.coffee +++ b/spec/app/file-spec.coffee @@ -16,10 +16,10 @@ describe 'File', -> fs.remove(path) if fs.exists(path) describe "when the contents of the file change", -> - it "triggers 'contents-change' event handlers", -> + it "triggers 'contents-changed' event handlers", -> changeHandler = null changeHandler = jasmine.createSpy('changeHandler') - file.on 'contents-change', changeHandler + file.on 'contents-changed', changeHandler fs.write(file.getPath(), "this is new!") waitsFor "change event", -> @@ -66,13 +66,13 @@ describe 'File', -> runs -> expect(file.getPath()).toBe newPath - it "maintains 'contents-change' events set on previous path", -> + it "maintains 'contents-changed' events set on previous path", -> moveHandler = null moveHandler = jasmine.createSpy('moveHandler') file.on 'move', moveHandler changeHandler = null changeHandler = jasmine.createSpy('changeHandler') - file.on 'contents-change', changeHandler + file.on 'contents-changed', changeHandler fs.move(path, newPath) @@ -93,7 +93,7 @@ describe 'File', -> changeHandler = jasmine.createSpy("file changed") removeHandler = jasmine.createSpy("file removed") - file.on 'contents-change', changeHandler + file.on 'contents-changed', changeHandler file.on 'remove', removeHandler expect(changeHandler).not.toHaveBeenCalled() diff --git a/src/app/buffer.coffee b/src/app/buffer.coffee index a8eaaf161..1cfa8e81d 100644 --- a/src/app/buffer.coffee +++ b/src/app/buffer.coffee @@ -55,7 +55,7 @@ class Buffer this subscribeToFile: -> - @file.on "contents-change", => + @file.on "contents-changed", => if @isModified() @conflict = true @updateCachedDiskContents() diff --git a/src/app/directory.coffee b/src/app/directory.coffee index 79eefe334..808e839e7 100644 --- a/src/app/directory.coffee +++ b/src/app/directory.coffee @@ -35,7 +35,7 @@ class Directory subscribeToNativeChangeEvents: -> @watchId = $native.watchPath @path, (eventType) => - @trigger "contents-change" if eventType is "contents-change" + @trigger "contents-changed" if eventType is "contents-change" unsubscribeFromNativeChangeEvents: -> $native.unwatchPath(@path, @watchId) diff --git a/src/app/file.coffee b/src/app/file.coffee index d06a775fb..d4d28ac0e 100644 --- a/src/app/file.coffee +++ b/src/app/file.coffee @@ -52,7 +52,7 @@ class File oldContents = @read() newContents = @read(true) return if oldContents == newContents - @trigger 'contents-change' + @trigger 'contents-changed' detectResurrectionAfterDelay: -> _.delay (=> @detectResurrection()), 50 diff --git a/src/packages/tree-view/spec/tree-view-spec.coffee b/src/packages/tree-view/spec/tree-view-spec.coffee index 7de459451..6da0dec8f 100644 --- a/src/packages/tree-view/spec/tree-view-spec.coffee +++ b/src/packages/tree-view/spec/tree-view-spec.coffee @@ -622,7 +622,7 @@ describe "TreeView", -> directoryChangeHandler = jasmine.createSpy("directory-change") dirView.on "tree-view:directory-modified", directoryChangeHandler - dirView.directory.trigger 'contents-change' + dirView.directory.trigger 'contents-changed' expect(directoryChangeHandler).toHaveBeenCalled() expect(treeView.find('.selected').text()).toBe fs.base(filePath) diff --git a/src/packages/tree-view/src/directory-view.coffee b/src/packages/tree-view/src/directory-view.coffee index 7db882b7e..692627a11 100644 --- a/src/packages/tree-view/src/directory-view.coffee +++ b/src/packages/tree-view/src/directory-view.coffee @@ -63,7 +63,7 @@ class DirectoryView extends View @isExpanded = false watchEntries: -> - @directory.on "contents-change.tree-view", => + @directory.on "contents-changed.tree-view", => @buildEntries() @trigger "tree-view:directory-modified"