simple_chartjs 1.0.1 → 1.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/simple_chartjs.js +7 -2
- data/lib/chartjs/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 38df04a462a9350de41d327c05513bfe047f2965
|
4
|
+
data.tar.gz: 315b24a1398347a40a7ddca3c9347bf517aa2e06
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 67f8eec57e9103b6c73843091cdcda6e2632c6be024ae7a393f076bdf41c82064d2534820f9ac2d6c7f1e95016c92d358af98e74a27dea03c87027804d5822e9
|
7
|
+
data.tar.gz: 2613e22bb50beb16cf858aef733bb6595dae3525623040789b019a6cb5802d13dfe3e13c65c7d4a74edeae47d2c1584bd7ca36463148377c1ac5f804c717c26a
|
@@ -72,12 +72,16 @@ SimpleChart.prototype.configureOption = function(option_name, current_options, o
|
|
72
72
|
SimpleChart.prototype.formatChartData = function(data) {
|
73
73
|
var chartData = data;
|
74
74
|
this.formatArrayRubyObjects(chartData.datasets);
|
75
|
-
if(
|
75
|
+
if(Object.keys(this.datasetProperties).length !== 0) {
|
76
76
|
for(property in this.datasetProperties) {
|
77
77
|
if(Array.isArray(this.datasetProperties[property])) {
|
78
|
-
for (var i = 0; i <
|
78
|
+
for (var i = 0; i < chartData.datasets.length; i++) {
|
79
79
|
chartData.datasets[i][property] = this.datasetProperties[property][i];
|
80
80
|
}
|
81
|
+
} else if(typeof(this.datasetProperties[property]) === 'function') {
|
82
|
+
for (var i = 0; i < chartData.datasets.length; i++) {
|
83
|
+
chartData.datasets[i][property] = this.datasetProperties[property](chartData.datasets[i]);
|
84
|
+
}
|
81
85
|
} else {
|
82
86
|
for (var i = 0; i < chartData.datasets.length; i++) {
|
83
87
|
chartData.datasets[i][property] = this.datasetProperties[property];
|
@@ -85,6 +89,7 @@ SimpleChart.prototype.formatChartData = function(data) {
|
|
85
89
|
}
|
86
90
|
}
|
87
91
|
}
|
92
|
+
|
88
93
|
return chartData;
|
89
94
|
}
|
90
95
|
|
data/lib/chartjs/version.rb
CHANGED