Properly dispose of most subscriptions

This commit is contained in:
Machiste Quintana 2015-08-10 08:05:20 -04:00
parent b7978075d0
commit fcdc684bde
1 changed files with 10 additions and 5 deletions

View File

@ -4,6 +4,7 @@ pkg = require('../package.json')
# Dependencies # Dependencies
plugin = module.exports plugin = module.exports
{CompositeDisposable} = require 'atom'
_ = require("lodash") _ = require("lodash")
Beautifiers = require("./beautifiers") Beautifiers = require("./beautifiers")
beautifier = new Beautifiers() beautifier = new Beautifiers()
@ -447,9 +448,13 @@ handleSaveEvent = ->
Subscriber.extend plugin Subscriber.extend plugin
plugin.config = _.merge(require('./config.coffee'), defaultLanguageOptions) plugin.config = _.merge(require('./config.coffee'), defaultLanguageOptions)
plugin.activate = -> plugin.activate = ->
handleSaveEvent() @subscriptions = new CompositeDisposable
@subscriptions.add handleSaveEvent()
plugin.subscribe atom.config.observe("atom-beautify.beautifyOnSave", handleSaveEvent) plugin.subscribe atom.config.observe("atom-beautify.beautifyOnSave", handleSaveEvent)
atom.commands.add "atom-workspace", "atom-beautify:beautify-editor", beautify @subscriptions.add atom.commands.add "atom-workspace", "atom-beautify:beautify-editor", beautify
atom.commands.add "atom-workspace", "atom-beautify:help-debug-editor", debug @subscriptions.add atom.commands.add "atom-workspace", "atom-beautify:help-debug-editor", debug
atom.commands.add ".tree-view .file .name", "atom-beautify:beautify-file", beautifyFile @subscriptions.add atom.commands.add ".tree-view .file .name", "atom-beautify:beautify-file", beautifyFile
atom.commands.add ".tree-view .directory .name", "atom-beautify:beautify-directory", beautifyDirectory @subscriptions.add atom.commands.add ".tree-view .directory .name", "atom-beautify:beautify-directory", beautifyDirectory
plugin.deactivate = ->
@subscriptions.dispose()