diff --git a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee index 4144ba715..b50136629 100644 --- a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee +++ b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee @@ -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 diff --git a/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee b/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee index 67d0d95dd..9c7e0ffb0 100644 --- a/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee +++ b/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee @@ -22,7 +22,7 @@ module.exports = editSession.lastOpened = state[editSession.getPath()] deactivate: -> - @loadPathsTask?.terminate() + @loadPathsTask?.abort() @loadPathsTask = null @fuzzyFinderView?.cancel() @fuzzyFinderView = null diff --git a/src/packages/snippets/lib/snippets.coffee b/src/packages/snippets/lib/snippets.coffee index fb514f11b..70872a08c 100644 --- a/src/packages/snippets/lib/snippets.coffee +++ b/src/packages/snippets/lib/snippets.coffee @@ -15,7 +15,7 @@ module.exports = rootView.on 'editor:attached', (e, editor) => @enableSnippetsInEditor(editor) deactivate: -> - @loadSnippetsTask?.terminate() + @loadSnippetsTask?.abort() loadAll: -> @loadSnippetsTask = new LoadSnippetsTask(this) diff --git a/src/stdlib/task.coffee b/src/stdlib/task.coffee index 21e8ac419..1210f4999 100644 --- a/src/stdlib/task.coffee +++ b/src/stdlib/task.coffee @@ -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