Merge branch 'master' of https://github.com/dump247/morris.js into du…

…mp247-master Conflicts: morris.min.js
morrisjs · Jun 26, 2012 · 67251e8 · 67251e8
2 parents 2c81ad7 + df2925d
commit 67251e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/lib/morris.coffee b/lib/morris.coffee
@@ -267,7 +267,7 @@ class Morris.Line
   #
   drawSeries: ->
     for i in [@seriesCoords.length-1..0]
-      coords = @seriesCoords[i]
+      coords = $.map(@seriesCoords[i], (c) -> c)
       if coords.length > 1
         path = @createPath coords, @options.marginTop, @left, @options.marginTop + @height, @left + @width
         @r.path(path)
@@ -287,9 +287,8 @@ class Morris.Line
 
   # create a path for a data series
   #
-  createPath: (all_coords, top, left, bottom, right) ->
+  createPath: (coords, top, left, bottom, right) ->
     path = ""
-    coords = $.map(all_coords, (c) -> c)
     if @options.smooth
       grads = @gradients coords
       for i in [0..coords.length-1]

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