Merge pull request #52 from fundon/dev

find-and-replace and git-diff now available

Author: fundon

History.md

@@ -1,3 +1,10 @@
+0.7.0 / 2014-04-05
+==================
+
+* use `prolix` mixin for debug
+* add plugins list
+* `find-and-replace` and `git-diff` now available!
+
 0.6.0 / 2014-04-04
 ==================
 

Readme.md

@@ -16,7 +16,7 @@ apm install minimap
 * Multiple Panes
 * Responsive
 * Mouse wheel and click-to-scroll _(no animation)_
-* drag-to-scroll
+* Drag-to-scroll
 
 ### Shortcuts
 
@@ -27,11 +27,16 @@ apm install minimap
 
 https://github.com/fundon/atom-minimap/graphs/contributors
 
+### Plugins
+
+The minimap can be augmented with plugins, belows the list of available plugins so far:
+
+  * [Find And Replace](https://atom.io/packages/minimap-find-and-replace)
+  * [Git Diff](https://atom.io/packages/minimap-git-diff)
 
 ### Roadmap
 
 * Custom style
-* Sync editing
 * Smooth animation
 
 ### License

lib/minimap-editor-view.coffee

@@ -1,11 +1,11 @@
 {EditorView, ScrollView, $} = require 'atom'
 {Emitter} = require 'emissary'
-Debug = require './mixins/debug'
+Debug = require 'prolix'
 
 module.exports =
 class MinimapEditorView extends ScrollView
   Emitter.includeInto(this)
-  Debug.includeInto(this)
+  Debug('minimap').includeInto(this)
 
   @content: ->
     @div class: 'minimap-editor editor editor-colors', =>

lib/minimap-view.coffee

@@ -1,13 +1,13 @@
 {$, View} = require 'atom'
 
 MinimapEditorView = require './minimap-editor-view'
-Debug = require './mixins/debug'
+Debug = require 'prolix'
 
 CONFIGS = require './config'
 
 module.exports =
 class MinimapView extends View
-  Debug.includeInto(this)
+  Debug('minimap').includeInto(this)
 
   @content: ->
     @div class: 'minimap', =>
@@ -22,7 +22,7 @@ class MinimapView extends View
 
   # VIEW CREATION/DESTRUCTION
 
-  constructor: (@paneView, @allowDebug) ->
+  constructor: (@paneView) ->
     super
 
     @scaleX = 0.2
@@ -33,7 +33,6 @@ class MinimapView extends View
     @transform @miniWrapper[0], @minimapScale
     # dragging's status
     @isPressed = false
-    @miniEditorView.allowDebug = @allowDebug
 
   initialize: ->
     @on 'mousewheel', @onMouseWheel

lib/minimap.coffee

@@ -1,10 +1,12 @@
 {Emitter} = require 'emissary'
 MinimapView = require './minimap-view'
+Debug = require 'prolix'
 
 require '../vendor/resizeend'
 
 class Minimap
   Emitter.includeInto(this)
+  Debug('minimap').includeInto(this)
 
   # We'll be storing each MinimapView using the id of their PaneView
   minimapViews: {}
@@ -13,11 +15,8 @@ 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', => @toggleNoDebug()
     atom.workspaceView.command 'minimap:toggle-debug', => @toggleDebug()
 
   deactivate: ->
@@ -26,8 +25,7 @@ class Minimap
     @minimapViews = {}
     @emit('deactivated')
 
-  toggle: (debugMode=false) ->
-    @allowDebug = debugMode
+  toggle: () ->
     if @active
       @active = false
       @deactivate()
@@ -37,7 +35,12 @@ class Minimap
       @emit('activated')
 
   toggleDebug: ->
-    @toggle(true)
+    @getChannel().activate()
+    @toggle()
+
+  toggleNoDebug: ->
+    @getChannel().deactivate()
+    @toggle()
 
   updateAllViews: ->
     view.onScrollViewResized() for id,view of @minimapViews
@@ -55,7 +58,7 @@ class Minimap
     # the callback.
     @eachPaneViewSubscription = atom.workspaceView.eachPaneView (paneView) =>
       paneId = paneView.model.id
-      view = new MinimapView(paneView, @allowDebug)
+      view = new MinimapView(paneView)
       view.onActiveItemChanged(paneView.getActiveItem())
       @updateAllViews()
 

lib/mixins/debug.coffee

@@ -1,7 +1,7 @@
 {
   "name": "minimap",
   "main": "./lib/minimap",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "private": true,
   "description": "A preview of the full source code.",
   "author": "Fangdun Cai <[email protected]>",
@@ -26,6 +26,7 @@
   },
   "dependencies": {
     "emissary": "1.x",
-    "mixto": "1.x"
+    "mixto": "1.x",
+    "prolix": "1.x"
   }
 }