Merge pull request #266 from movabletype/options-smooth-boolean

Use the @options.smooth directly if the value's type is "boolean".
morrisjs · Oct 12, 2013 · 4345fa3 · 4345fa3
2 parents b98ae8a + 13af310
commit 4345fa3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/morris.line.coffee b/lib/morris.line.coffee
@@ -121,7 +121,7 @@ class Morris.Line extends Morris.Grid
   # @private
   generatePaths: ->
     @paths = for i in [0...@options.ykeys.length]
-      smooth = @options.smooth is true or @options.ykeys[i] in @options.smooth
+      smooth = if typeof @options.smooth is "boolean" then @options.smooth else @options.ykeys[i] in @options.smooth
       coords = ({x: r._x, y: r._y[i]} for r in @data when r._y[i] isnt undefined)
       coords = (c for c in coords when c.y isnt null) if @options.continuousLine
 

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