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

fixed the code to use ykeys for smooth instead of seriesLabels

Browse Source
This commit is contained in:
tiraeth 2012-10-15 23:16:00 +02:00
parent 9773a697b3
commit b8674f3869
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

@ -223,7 +223,7 @@ class Morris.Line
shouldDrawSmooth: (series) => shouldDrawSmooth: (series) =>
if typeof @options.smooth is 'boolean' && @options.smooth if typeof @options.smooth is 'boolean' && @options.smooth
true true
else if typeof @options.smooth is 'object' and $.inArray(@seriesLabels[series], @options.smooth) > -1 else if typeof @options.smooth is 'object' and $.inArray(@options.ykeys[series], @options.smooth) > -1
true true
else else
false false

2
morris.js
View File

@ -559,7 +559,7 @@
Line.prototype.shouldDrawSmooth = function(series) { Line.prototype.shouldDrawSmooth = function(series) {
if (typeof this.options.smooth === 'boolean' && this.options.smooth) { if (typeof this.options.smooth === 'boolean' && this.options.smooth) {
return true; return true;
} else if (typeof this.options.smooth === 'object' && $.inArray(this.seriesLabels[series], this.options.smooth) > -1) { } else if (typeof this.options.smooth === 'object' && $.inArray(this.options.ykeys[series], this.options.smooth) > -1) {
return true; return true;
} else { } else {
return false; return false;

2
morris.min.js vendored
View File

File diff suppressed because one or more lines are too long