Bump version to 0.5.0

Conflicts:
	History.md
	package.json

Author: fundon

History.md

@@ -1,3 +1,10 @@
+0.5.0 / 2014-04-03
+==================
+
+* drag-to-scroll
+* using `ctrl-k ctrl-m` toggle the minimap without the logs
+* using `ctrl-k ctrl-d` toggle the minimap with the logs
+
 0.4.0 / 2014-04-02
 ==================
 

Readme.md

@@ -15,7 +15,13 @@ apm install minimap
 * [Redacted Font][]
 * Multiple Panes
 * Responsive
-* Mouse wheel and simple click-to-scroll _(no animation)_ support
+* Mouse wheel and click-to-scroll _(no animation)_
+* drag-to-scroll
+
+### Shortcuts
+
+* `ctrl-k ctrl-m` toggle the minimap without the logs
+* `ctrl-k ctrl-d` toggle the minimap with the logs
 
 ### Contributors
 

keymaps/minimap.cson

@@ -8,4 +8,5 @@
 # For more detailed documentation see
 # https://atom.io/docs/latest/advanced/keymaps
 '.workspace':
-  'ctrl-alt-o': 'minimap:toggle'
+  'ctrl-k ctrl-m': 'minimap:toggle'
+  'ctrl-k ctrl-d': 'minimap:toggle-debug'

lib/minimap-view.coffee

@@ -24,19 +24,25 @@ class MinimapView extends View
 
   # VIEW CREATION/DESTRUCTION
 
-  constructor: (@paneView) ->
+  constructor: (@paneView, @allowDebug) ->
     super
 
     @scaleX = 0.2
     @scaleY = @scaleX * 0.8
     @minimapScale = @scale(@scaleX, @scaleY)
     @miniScrollView = @miniEditorView.scrollView
     @minimapScroll = 0
+    @transform @miniWrapper[0], @minimapScale
+    # dragging's status
+    @isPressed = false
+    @miniEditorView.allowDebug = @allowDebug
 
   initialize: ->
     @on 'mousewheel', @onMouseWheel
     @on 'mousedown', @onMouseDown
 
+    @on 'mousedown', '.minimap-visible-area', @onDragStart
+
     @subscribe @paneView.model.$activeItem, @onActiveItemChanged
     @subscribe @miniEditorView, 'minimap:updated', @updateMinimapView
 
@@ -47,6 +53,7 @@ class MinimapView extends View
       @configs.theme = atom.config.get(themeProp) ? CONFIGS.theme
       @updateTheme()
 
+
   destroy: ->
     @off()
     @unsubscribe()
@@ -68,8 +75,6 @@ class MinimapView extends View
     @paneView.removeClass('with-minimap')
     @detachFromPaneView()
 
-  resetMinimapTransform: -> @transform @miniWrapper[0], @scale()
-
   minimapIsAttached: -> @paneView.find('.minimap').length is 1
 
   # EDITOR VIEW MANAGEMENT
@@ -193,6 +198,20 @@ class MinimapView extends View
   onScrollViewResized: =>
     @updateMinimapView()
 
+  onDragStart: (e) =>
+    # only supports for left-click
+    return unless e.which is 1
+    @isPressed = true
+    @on 'mousemove.visible-area', @onMove
+    @on 'mouseup.visible-area', @onDragEnd
+
+  onMove: (e) =>
+    @onMouseDown e if @isPressed
+
+  onDragEnd: (e) =>
+    @isPressed = false
+    @off '.visible-area'
+
   # OTHER PRIVATE METHODS
 
   activeTabSupportMinimap: ->

lib/minimap.coffee

@@ -11,16 +11,21 @@ class Minimap
   # minimapViews object will never be set to null.
   active: false
 
+  # Does the minimap debug features are activated on toggle
+  allowDebug: false
+
   activate: ->
     atom.workspaceView.command 'minimap:toggle', => @toggle()
+    atom.workspaceView.command 'minimap:toggle-debug', => @toggleDebug()
 
   deactivate: ->
     view.destroy() for id, view of @minimapViews
     @eachPaneViewSubscription.off()
     @minimapViews = {}
     @emit('deactivated')
 
-  toggle: ->
+  toggle: (debugMode=false) ->
+    @allowDebug = debugMode
     if @active
       @deactivate()
     else
@@ -29,14 +34,16 @@ class Minimap
 
     @active = not @active
 
+  toggleDebug: ->
+    @toggle(true)
+
   updateAllViews: ->
     view.onScrollViewResized() for id,view of @minimapViews
 
   minimapForEditorView: (editorView) ->
     @minimapForPaneView(editorView.getPane())
 
   minimapForPaneView: (paneView) -> @minimapForPane(paneView.model)
-
   minimapForPane: (pane) -> @minimapViews[pane.id]
 
   open: ->
@@ -46,7 +53,7 @@ class Minimap
     # the callback.
     @eachPaneViewSubscription = atom.workspaceView.eachPaneView (paneView) =>
       paneId = paneView.model.id
-      view = new MinimapView(paneView)
+      view = new MinimapView(paneView, @allowDebug)
       view.onActiveItemChanged(paneView.getActiveItem())
       @updateAllViews()
 

lib/mixins/debug.coffee

@@ -2,6 +2,8 @@ Mixin = require 'mixto'
 
 module.exports =
 class Debug extends Mixin
+  allowDebug: false
+  
   log: (args...) ->
     console.log.apply(console, args) if @inDevMode()
 
@@ -35,4 +37,4 @@ class Debug extends Mixin
       time = @logIntermediateTime(label)
       @benchmarkTimes.push(time)
 
-  inDevMode: -> atom.inDevMode()
+  inDevMode: -> @allowDebug and atom.inDevMode()

package.json

@@ -1,7 +1,7 @@
 {
   "name": "minimap",
   "main": "./lib/minimap",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "private": true,
   "description": "A preview of the full source code.",
   "author": "Fangdun Cai <[email protected]>",
@@ -16,7 +16,8 @@
     }
   ],
   "activationEvents": [
-    "minimap:toggle"
+    "minimap:toggle",
+    "minimap:toggle-debug"
   ],
   "repository": "https://github.com/fundon/atom-minimap",
   "license": "MIT",