Merge pull request #314 from abrinkman/master

Adds the ability to mark events on a non-time-based line and area charts.
morrisjs · Nov 9, 2013 · 3cba9e5 · 3cba9e5
2 parents a738317 + b162e18
commit 3cba9e5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/lib/morris.grid.coffee b/lib/morris.grid.coffee
@@ -186,8 +186,11 @@ class Morris.Grid extends Morris.EventEmitter
     @xmax = @data[@data.length - 1].x
 
     @events = []
-    if @options.parseTime and @options.events.length > 0
-      @events = (Morris.parseDate(e) for e in @options.events)
+    if @options.events.length > 0
+      if @options.parseTime
+        @events = (Morris.parseDate(e) for e in @options.events)
+      else
+        @events = @options.events
       @xmax = Math.max(@xmax, Math.max.apply(null, @events))
       @xmin = Math.min(@xmin, Math.min.apply(null, @events))
 

diff --git a/morris.js b/morris.js