Merge pull request #49 from fundon/dev

Hotfix, broken minimap activation on non editor view

Author: fundon

History.md

@@ -1,3 +1,9 @@
+0.6.0 / 2014-04-04
+==================
+
+* fix broken minimap activation on non editor view, #46
+* move resizeend to main file
+
 0.5.0 / 2014-04-03
 ==================
 

lib/minimap-view.coffee

@@ -5,8 +5,6 @@ Debug = require './mixins/debug'
 
 CONFIGS = require './config'
 
-require '../vendor/resizeend'
-
 module.exports =
 class MinimapView extends View
   Debug.includeInto(this)
@@ -81,10 +79,10 @@ class MinimapView extends View
 
   storeActiveEditor: ->
     @editorView = @getEditorView()
+    @editor = @editorView.getEditor()
 
     @unsubscribeFromEditor()
 
-    @editor = @editorView.getEditor()
     @scrollView = @editorView.scrollView
     @scrollViewLines = @scrollView.find('.lines')
 
@@ -98,12 +96,19 @@ class MinimapView extends View
     @subscribe @editor, 'scroll-top-changed.minimap', @updateScroll
     #@subscribe @editor, 'scroll-left-changed.minimap', @updateScroll
 
+  # See /Applications/Atom.app/Contents/Resources/app/src/pane-view.js#349
+  # pane-view's private api
+  # `paneView.activeView` and `paneView.activeItem`
   getEditorView: -> @paneView.viewForItem(@activeItem)
 
   getEditorViewClientRect: -> @scrollView[0].getBoundingClientRect()
 
   getScrollViewClientRect: -> @scrollViewLines[0].getBoundingClientRect()
 
+  # See https://atom.io/docs/api/v0.83.0/api/classes/Pane.html#getActiveEditor-instance
+  # Returns an Editor if the pane item is an Editor, or null otherwise.
+  getEditor: -> @paneView.model.getActiveEditor()
+
   setMinimapEditorView: ->
     # update minimap-editor
     setImmediate => @miniEditorView.setEditorView(@editorView)
@@ -116,6 +121,7 @@ class MinimapView extends View
   updateMinimapEditorView: => @miniEditorView.update()
 
   updateMinimapView: =>
+    return unless @editorView
     # offset minimap
     @offset top: @editorView.offset().top
 
@@ -154,14 +160,15 @@ class MinimapView extends View
 
   onActiveItemChanged: (item) =>
     # Fix called twice when opening minimap!
-    return if @activeItem == item
+    return if item is @activeItem
     @activeItem = item
 
     if @activeTabSupportMinimap()
       @log 'minimap is supported by the current tab'
       @activatePaneViewMinimap() unless @minimapIsAttached()
       @storeActiveEditor()
       @setMinimapEditorView()
+      @updateMinimapView()
     else
       # Ignore any tab that is not an editor
       @deactivatePaneViewMinimap()
@@ -195,12 +202,11 @@ class MinimapView extends View
       @isClicked = false
     , 377
 
-  onScrollViewResized: =>
-    @updateMinimapView()
+  onScrollViewResized: => @updateMinimapView()
 
   onDragStart: (e) =>
     # only supports for left-click
-    return unless e.which is 1
+    return if e.which isnt 1
     @isPressed = true
     @on 'mousemove.visible-area', @onMove
     @on 'mouseup.visible-area', @onDragEnd
@@ -214,10 +220,7 @@ class MinimapView extends View
 
   # OTHER PRIVATE METHODS
 
-  activeTabSupportMinimap: ->
-    editorView = @getEditorView()
-
-    editorView? and editorView.hasClass('editor')
+  activeTabSupportMinimap: -> @getEditor()
 
   scale: (x=1,y=1) -> "scale(#{x}, #{y}) "
   translateY: (y=0) -> "translate3d(0, #{y}px, 0)"

lib/minimap.coffee

@@ -1,6 +1,8 @@
 {Emitter} = require 'emissary'
 MinimapView = require './minimap-view'
 
+require '../vendor/resizeend'
+
 class Minimap
   Emitter.includeInto(this)
 
@@ -27,13 +29,13 @@ class Minimap
   toggle: (debugMode=false) ->
     @allowDebug = debugMode
     if @active
+      @active = false
       @deactivate()
     else
       @open()
+      @active = true
       @emit('activated')
 
-    @active = not @active
-
   toggleDebug: ->
     @toggle(true)
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "minimap",
   "main": "./lib/minimap",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "private": true,
   "description": "A preview of the full source code.",
   "author": "Fangdun Cai <[email protected]>",