Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-10 21:36:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Use the @options.smooth directly if the value's type is "boolean".
This commit is contained in:
Olly Smith 2013-10-12 05:20:24 -07:00
commit 4345fa3723
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/morris.line.coffee
View File

@ -121,7 +121,7 @@ class Morris.Line extends Morris.Grid
# @private # @private
generatePaths: -> generatePaths: ->
@paths = for i in [0...@options.ykeys.length] @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 = ({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 coords = (c for c in coords when c.y isnt null) if @options.continuousLine

2
morris.js
View File

@ -788,7 +788,7 @@
var _i, _ref, _ref1, _results; var _i, _ref, _ref1, _results;
_results = []; _results = [];
for (i = _i = 0, _ref = this.options.ykeys.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) { for (i = _i = 0, _ref = this.options.ykeys.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
smooth = this.options.smooth === true || (_ref1 = this.options.ykeys[i], __indexOf.call(this.options.smooth, _ref1) >= 0); smooth = typeof this.options.smooth === "boolean" ? this.options.smooth : (_ref1 = this.options.ykeys[i], __indexOf.call(this.options.smooth, _ref1) >= 0);
coords = (function() { coords = (function() {
var _j, _len, _ref2, _results1; var _j, _len, _ref2, _results1;
_ref2 = this.data; _ref2 = this.data;

2
morris.min.js vendored
View File

File diff suppressed because one or more lines are too long