Merge pull request #15 from aki77/fix/remove-dependencies

Fix leak bindings

Author: abe33

lib/minimap-git-diff-binding.coffee

@@ -1,18 +1,19 @@
-{CompositeDisposable} = require 'event-kit'
+{CompositeDisposable} = require 'atom'
 {repositoryForPath} = require './helpers'
 
 module.exports =
 class MinimapGitDiffBinding
 
   active: false
 
-  constructor: (@gitDiff, @minimap) ->
+  constructor: (@minimap) ->
     @editor = @minimap.getTextEditor()
     @decorations = {}
     @markers = null
     @subscriptions = new CompositeDisposable
 
     @subscriptions.add @editor.getBuffer().onDidStopChanging @updateDiffs
+    @subscriptions.add @minimap.onDidDestroy @destroy
 
     if repository = @getRepo()
       @subscriptions.add repository.onDidChangeStatuses =>
@@ -59,10 +60,11 @@ class MinimapGitDiffBinding
     @markers ?= []
     @markers.push(marker)
 
-  destroy: ->
+  destroy: =>
     @removeDecorations()
     @subscriptions.dispose()
     @diffs = null
+    @minimap = null
 
   getPath: -> @editor.getBuffer()?.getPath()
 

lib/minimap-git-diff.coffee

@@ -1,26 +1,23 @@
-{CompositeDisposable, Disposable} = require 'event-kit'
-{requirePackages} = require 'atom-utils'
+{CompositeDisposable, Disposable} = require 'atom'
 
 MinimapGitDiffBinding = null
 
 class MinimapGitDiff
 
-  bindings: {}
   pluginActive: false
   constructor: ->
     @subscriptions = new CompositeDisposable
 
   isActive: -> @pluginActive
 
   activate: ->
+    @bindings = new WeakMap
 
   consumeMinimapServiceV1: (@minimap) ->
     @minimap.registerPlugin 'git-diff', this
 
   deactivate: ->
-    binding.destroy() for id,binding of @bindings
-    @bindings = {}
-    @gitDiff = null
+    @destroyBindings()
     @minimap = null
 
   activatePlugin: ->
@@ -61,16 +58,15 @@ class MinimapGitDiff
 
       return unless editor?
 
-      id = editor.id
-      binding = new MinimapGitDiffBinding @gitDiff, minimap
-      @bindings[id] = binding
+      binding = new MinimapGitDiffBinding minimap
+      @bindings.set(minimap, binding)
 
   getRepositories: -> atom.project.getRepositories().filter (repo) -> repo?
 
   destroyBindings: =>
-    binding.destroy() for id,binding of @bindings
-    @bindings = {}
-
-  asDisposable: (subscription) -> new Disposable -> subscription.off()
+    return unless @minimap?
+    for minimap in @minimap.editorsMinimaps
+      @bindings.get(minimap)?.destroy()
+      @bindings.delete(minimap)
 
 module.exports = new MinimapGitDiff

package.json

@@ -18,8 +18,6 @@
   },
   "dependencies": {
     "mixto": "1.x",
-    "fs-plus": "^2.0.0",
-    "event-kit": ">= 0.7.2",
-    "atom-utils": "0.0.1"
+    "fs-plus": "^2.0.0"
   }
 }