Merge remote-tracking branch 'origin/dev'

Author: fundon

lib/minimap-indicator.coffee

@@ -6,11 +6,13 @@
 #   |       |----------> Minimap Wrapper
 #   |       |   .
 #   |       |   .
-#   #########------> Minimap Indicator (Minimap visible area)
+#   =========------> Minimap Indicator
 #   |       |   .
 #   ---------   .
 #   .           .
 #   .............
+#
+
 #
 #  Basic Rectangle
 #
@@ -120,4 +122,3 @@ class Indicator extends Rectangle
 
   computeFromCenterY: (cy) ->
     @setCenterY(cy) - @scroller.y
-

lib/minimap-view.coffee

@@ -94,6 +94,7 @@ class MinimapView extends View
 
   unsubscribeFromEditor: ->
     @unsubscribe @editor, '.minimap'
+    @unsubscribe @scrollView, '.minimap'
 
   subscribeToEditor: ->
     @subscribe @editor, 'screen-lines-changed.minimap', @updateMinimapEditorView