Implement minimap element destruction

atom-minimap · Dec 17, 2014 · 6008181 · 6008181
1 parent cf61a8e
commit 6008181
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/lib/minimap-element.coffee b/lib/minimap-element.coffee
@@ -81,14 +81,18 @@ class MinimapElement extends HTMLElement
   detach: ->
     return unless @attached
     return unless @parentNode?
-
     @parentNode.removeChild(this)
 
+  destroy: ->
+    @subscriptions.dispose()
+    @detach()
+
   getModel: -> @minimap
 
   setModel: (@minimap) ->
     @subscriptions.add @minimap.onDidChangeScrollTop => @requestUpdate()
     @subscriptions.add @minimap.onDidChangeScrollLeft => @requestUpdate()
+    @subscriptions.add @minimap.onDidDestroy => @destroy()
     @subscriptions.add @minimap.onDidChangeConfig =>
       @requestForcedUpdate() if @attached
     @subscriptions.add @minimap.onDidChange (change) =>
@@ -185,7 +189,7 @@ class MinimapElement extends HTMLElement
     @requestUpdate()
 
   update: ->
-    return unless @attached and @isVisible()
+    return unless @attached and @isVisible() and not @minimap.isDestroyed()
 
     if @adjustToSoftWrap
       @style.marginRight = @marginRight + 'px'

diff --git a/spec/minimap-element-spec.coffee b/spec/minimap-element-spec.coffee
@@ -231,6 +231,28 @@ describe 'MinimapElement', ->
           expect(minimapElement.canvas.width).toEqual(canvasWidth)
           expect(minimapElement.canvas.height).toEqual(canvasHeight)
 
+    #    ########  ########  ######  ######## ########   #######  ##    ##
+    #    ##     ## ##       ##    ##    ##    ##     ## ##     ##  ##  ##
+    #    ##     ## ##       ##          ##    ##     ## ##     ##   ####
+    #    ##     ## ######    ######     ##    ########  ##     ##    ##
+    #    ##     ## ##             ##    ##    ##   ##   ##     ##    ##
+    #    ##     ## ##       ##    ##    ##    ##    ##  ##     ##    ##
+    #    ########  ########  ######     ##    ##     ##  #######     ##
+
+    describe 'when the model is destroyed', ->
+      beforeEach ->
+        minimap.destroy()
+
+      it 'detaches itself from its parent', ->
+        expect(minimapElement.parentNode).toBeNull()
+
+      it 'stops the DOM polling interval', ->
+        spyOn(minimapElement, 'pollDOM')
+
+        advanceClock(200)
+
+        expect(minimapElement.pollDOM).not.toHaveBeenCalled()
+
     #     ######   #######  ##    ## ######## ####  ######
     #    ##    ## ##     ## ###   ## ##        ##  ##    ##
     #    ##       ##     ## ####  ## ##        ##  ##