mirror of
https://github.com/atom/atom.git
synced 2026-02-14 16:45:14 -05:00
Rename Task.terminate to Task.abort
This commit is contained in:
@@ -132,7 +132,7 @@ class FuzzyFinderView extends SelectList
|
||||
@setLoading("Indexing...")
|
||||
|
||||
if @reloadProjectPaths
|
||||
@loadPathsTask?.terminate()
|
||||
@loadPathsTask?.abort()
|
||||
callback = (paths) =>
|
||||
@projectPaths = paths
|
||||
@reloadProjectPaths = false
|
||||
@@ -173,7 +173,7 @@ class FuzzyFinderView extends SelectList
|
||||
detach: ->
|
||||
super
|
||||
|
||||
@loadPathsTask?.terminate()
|
||||
@loadPathsTask?.abort()
|
||||
|
||||
attach: ->
|
||||
super
|
||||
|
||||
@@ -22,7 +22,7 @@ module.exports =
|
||||
editSession.lastOpened = state[editSession.getPath()]
|
||||
|
||||
deactivate: ->
|
||||
@loadPathsTask?.terminate()
|
||||
@loadPathsTask?.abort()
|
||||
@loadPathsTask = null
|
||||
@fuzzyFinderView?.cancel()
|
||||
@fuzzyFinderView = null
|
||||
|
||||
@@ -15,7 +15,7 @@ module.exports =
|
||||
rootView.on 'editor:attached', (e, editor) => @enableSnippetsInEditor(editor)
|
||||
|
||||
deactivate: ->
|
||||
@loadSnippetsTask?.terminate()
|
||||
@loadSnippetsTask?.abort()
|
||||
|
||||
loadAll: ->
|
||||
@loadSnippetsTask = new LoadSnippetsTask(this)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
module.exports =
|
||||
class Task
|
||||
terminated: false
|
||||
aborted: false
|
||||
|
||||
constructor: (@path) ->
|
||||
|
||||
@@ -9,7 +9,7 @@ class Task
|
||||
|
||||
@worker = new Worker(require.getPath('task-shell'))
|
||||
@worker.onmessage = ({data}) =>
|
||||
if @terminated
|
||||
if @aborted
|
||||
@done()
|
||||
return
|
||||
|
||||
@@ -42,10 +42,10 @@ class Task
|
||||
postMessage: (data) ->
|
||||
@worker.postMessage(data)
|
||||
|
||||
terminate: ->
|
||||
@terminated = true
|
||||
abort: ->
|
||||
@aborted = true
|
||||
|
||||
done: ->
|
||||
@terminate()
|
||||
@abort()
|
||||
@worker?.terminate()
|
||||
@worker = null
|
||||
|
||||
Reference in New Issue
Block a user