Merge pull request #258 from fundon/fix/toggle

Fix toggle, disable/enable

lib/main.coffee

@@ -89,18 +89,21 @@ class Main
   # Internal: Used only at export time.
   constructor: ->
     @emitter = new Emitter
-    @subscriptions = new CompositeDisposable
 
-  # Activates the minimap package.
-  activate: ->
+    # Commands Subscriptions
+    @subscriptionsOfCommands = new CompositeDisposable
+    @subscriptionsOfCommands.add atom.commands.add 'atom-workspace',
+      'minimap:toggle': => @toggle()
+      'minimap:generate-plugin': => @generatePlugin()
+
+    # Other Subscriptions
     @subscriptions = new CompositeDisposable
-    MinimapElement ?= require './minimap-element'
 
+    MinimapElement ?= require './minimap-element'
     MinimapElement.registerViewProvider()
 
-    @subscriptions.add atom.commands.add 'atom-workspace',
-      'minimap:toggle': => @toggle()
-      'minimap:generate-plugin': => @generatePlugin()
+  # Activates the minimap package.
+  activate: ->
 
     @toggle() if atom.config.get 'minimap.autoToggle'
 
@@ -130,6 +133,9 @@ class Main
   toggle: ->
     if @toggled
       @toggled = false
+      @editorsMinimaps?.forEach (value, key) =>
+        value.destroy()
+        @editorsMinimaps.delete(key)
       @subscriptions.dispose()
     else
       @toggled = true

lib/minimap-element.coffee

@@ -93,6 +93,7 @@ class MinimapElement extends HTMLElement
   attach: ->
     return if @attached
     @swapMinimapPosition()
+    @attached = true
 
   attachToLeft: ->
     root = @getTextEditorElementRoot()

package.json

@@ -24,7 +24,7 @@
     "mixto": "1.x",
     "delegato": "1.x",
     "semver": "~2.3.0",
-    "event-kit": "0.7.x",
+    "event-kit": "1.x",
     "fs-plus": "2.x",
     "temp": "0.5.0",
     "underscore-plus": "1.x",

spec/minimap-element-spec.coffee

@@ -15,6 +15,8 @@ realOffsetLeft = (o) ->
   transform = new WebKitCSSMatrix window.getComputedStyle(o).transform
   o.offsetLeft + transform.m41
 
+devicePixelRatio = window.devicePixelRatio || 1
+
 sleep = (duration) ->
   t = new Date
   waitsFor -> new Date - t > duration
@@ -119,8 +121,8 @@ describe 'MinimapElement', ->
       expect(minimapElement.offsetWidth).toBeCloseTo(editorElement.clientWidth / 11, 0)
 
     it 'resizes the canvas to fit the minimap', ->
-      expect(canvas.offsetHeight).toEqual(minimapElement.offsetHeight + minimap.getLineHeight())
-      expect(canvas.offsetWidth).toEqual(minimapElement.offsetWidth)
+      expect(canvas.offsetHeight / devicePixelRatio).toEqual(minimapElement.offsetHeight + minimap.getLineHeight())
+      expect(canvas.offsetWidth / devicePixelRatio).toEqual(minimapElement.offsetWidth)
 
     it 'requests an update', ->
       expect(minimapElement.frameRequested).toBeTruthy()
@@ -202,8 +204,8 @@ describe 'MinimapElement', ->
           expect(minimapElement.offsetWidth).toBeCloseTo(editorElement.offsetWidth / 11, 0)
           expect(minimapElement.offsetHeight).toEqual(editorElement.offsetHeight)
 
-          expect(canvas.offsetWidth).toEqual(minimapElement.offsetWidth)
-          expect(canvas.offsetHeight).toEqual(minimapElement.offsetHeight + minimap.getLineHeight())
+          expect(canvas.offsetWidth / devicePixelRatio).toEqual(minimapElement.offsetWidth)
+          expect(canvas.offsetHeight / devicePixelRatio).toEqual(minimapElement.offsetHeight + minimap.getLineHeight())
 
       describe 'when the editor visible content is changed', ->
         beforeEach ->
@@ -500,7 +502,7 @@ describe 'MinimapElement', ->
         nextAnimationFrame()
 
       it 'adjusts the width of the minimap canvas', ->
-        expect(minimapElement.canvas.width).toEqual(4)
+        expect(minimapElement.canvas.width / devicePixelRatio).toEqual(4)
 
       it 'offsets the minimap by the difference', ->
         expect(realOffsetLeft(minimapElement)).toBeCloseTo(editorElement.clientWidth - 4, -1)
@@ -511,7 +513,7 @@ describe 'MinimapElement', ->
           sleep(150)
           runs ->
             nextAnimationFrame()
-            expect(minimapElement.canvas.width).toEqual(4)
+            expect(minimapElement.canvas.width / devicePixelRatio).toEqual(4)
 
       describe 'when the editor is resized', ->
         beforeEach ->