mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
Rename File 'remove' & 'move' events to passive voice
'remove' -> 'removed' 'move' -> 'moved'
This commit is contained in:
@@ -141,7 +141,7 @@ describe 'Buffer', ->
|
||||
|
||||
fs.remove(path)
|
||||
waitsFor "file to be removed", (done) ->
|
||||
bufferToDelete.file.one 'remove', done
|
||||
bufferToDelete.file.one 'removed', done
|
||||
|
||||
afterEach ->
|
||||
bufferToDelete.destroy()
|
||||
@@ -770,7 +770,7 @@ describe 'Buffer', ->
|
||||
|
||||
fs.remove(path)
|
||||
waitsFor "file to be removed", (done) ->
|
||||
bufferToDelete.file.one 'remove', done
|
||||
bufferToDelete.file.one 'removed', done
|
||||
|
||||
runs ->
|
||||
expect(contentsModifiedHandler).toHaveBeenCalledWith(differsFromDisk:true)
|
||||
|
||||
@@ -36,7 +36,7 @@ describe 'File', ->
|
||||
it "triggers 'remove' event handlers", ->
|
||||
removeHandler = null
|
||||
removeHandler = jasmine.createSpy('removeHandler')
|
||||
file.on 'remove', removeHandler
|
||||
file.on 'removed', removeHandler
|
||||
fs.remove(file.getPath())
|
||||
|
||||
waitsFor "remove event", ->
|
||||
@@ -51,12 +51,12 @@ describe 'File', ->
|
||||
afterEach ->
|
||||
if fs.exists(newPath)
|
||||
fs.remove(newPath)
|
||||
waitsFor "remove event", (done) -> file.on 'remove', done
|
||||
waitsFor "remove event", (done) -> file.on 'removed', done
|
||||
|
||||
it "it updates its path", ->
|
||||
moveHandler = null
|
||||
moveHandler = jasmine.createSpy('moveHandler')
|
||||
file.on 'move', moveHandler
|
||||
file.on 'moved', moveHandler
|
||||
|
||||
fs.move(path, newPath)
|
||||
|
||||
@@ -69,7 +69,7 @@ describe 'File', ->
|
||||
it "maintains 'contents-changed' events set on previous path", ->
|
||||
moveHandler = null
|
||||
moveHandler = jasmine.createSpy('moveHandler')
|
||||
file.on 'move', moveHandler
|
||||
file.on 'moved', moveHandler
|
||||
changeHandler = null
|
||||
changeHandler = jasmine.createSpy('changeHandler')
|
||||
file.on 'contents-changed', changeHandler
|
||||
@@ -94,7 +94,7 @@ describe 'File', ->
|
||||
changeHandler = jasmine.createSpy("file changed")
|
||||
removeHandler = jasmine.createSpy("file removed")
|
||||
file.on 'contents-changed', changeHandler
|
||||
file.on 'remove', removeHandler
|
||||
file.on 'removed', removeHandler
|
||||
|
||||
expect(changeHandler).not.toHaveBeenCalled()
|
||||
|
||||
|
||||
@@ -63,11 +63,11 @@ class Buffer
|
||||
else
|
||||
@reload()
|
||||
|
||||
@file.on "remove", =>
|
||||
@file.on "removed", =>
|
||||
@updateCachedDiskContents()
|
||||
@trigger "contents-modified", {differsFromDisk: true}
|
||||
|
||||
@file.on "move", =>
|
||||
@file.on "moved", =>
|
||||
@trigger "path-changed", this
|
||||
|
||||
reload: ->
|
||||
|
||||
@@ -47,7 +47,7 @@ class File
|
||||
@detectResurrectionAfterDelay()
|
||||
else if eventType is "move"
|
||||
@setPath(path)
|
||||
@trigger "move"
|
||||
@trigger "moved"
|
||||
else if eventType is "contents-change"
|
||||
oldContents = @read()
|
||||
newContents = @read(true)
|
||||
@@ -64,7 +64,7 @@ class File
|
||||
else
|
||||
@cachedContents = null
|
||||
@unsubscribeFromNativeChangeEvents()
|
||||
@trigger "remove"
|
||||
@trigger "removed"
|
||||
|
||||
subscribeToNativeChangeEvents: ->
|
||||
@watchId = $native.watchPath @path, (eventType, path) =>
|
||||
|
||||
Reference in New Issue
Block a user