Adds the ability to mark events on a non-time-based line graph

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
+    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))
 

morris.js

@@ -267,7 +267,8 @@
       this.xmin = this.data[0].x;
       this.xmax = this.data[this.data.length - 1].x;
       this.events = [];
-      if (this.options.parseTime && this.options.events.length > 0) {
+      if (this.options.events.length > 0) {
+        if (this.options.parseTime) {
           this.events = (function() {
             var _i, _len, _ref, _results;
             _ref = this.options.events;
@@ -278,6 +279,9 @@
             }
             return _results;
           }).call(this);
+        } else {
+          this.events = this.options.events;
+        }
         this.xmax = Math.max(this.xmax, Math.max.apply(null, this.events));
         this.xmin = Math.min(this.xmin, Math.min.apply(null, this.events));
       }