From 0d2fa807da54e2c56d3a3778741c8ee139238725 Mon Sep 17 00:00:00 2001 From: Evert Timberg Date: Wed, 7 Oct 2015 19:54:53 -0400 Subject: [PATCH] Update samples with some hidden datasets --- samples/bar.html | 1 + samples/combo-bar-line.html | 6 +++--- samples/doughnut.html | 1 + samples/line-x-axis-filter.html | 4 ++-- samples/line.html | 4 ++++ samples/radar.html | 6 +++++- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/samples/bar.html b/samples/bar.html index 1101602da..609f672f9 100644 --- a/samples/bar.html +++ b/samples/bar.html @@ -45,6 +45,7 @@ backgroundColor: "rgba(220,220,220,0.5)", data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()] }, { + hidden: true, label: 'Dataset 2', backgroundColor: "rgba(151,187,205,0.5)", data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()] diff --git a/samples/combo-bar-line.html b/samples/combo-bar-line.html index f2e936ab3..b0a96f78f 100644 --- a/samples/combo-bar-line.html +++ b/samples/combo-bar-line.html @@ -2,7 +2,7 @@ - Bar Chart + Combo Bar-Line Chart @@ -30,14 +30,14 @@ borderColor: 'white', borderWidth: 2 }, { - type: 'bar', + type: 'line', label: 'Dataset 2', backgroundColor: "rgba(151,187,205,0.5)", data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()], borderColor: 'white', borderWidth: 2 }, { - type: 'line', + type: 'bar', label: 'Dataset 3', backgroundColor: "rgba(220,220,220,0.5)", data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()] diff --git a/samples/doughnut.html b/samples/doughnut.html index 728c8847a..3972fbc0c 100644 --- a/samples/doughnut.html +++ b/samples/doughnut.html @@ -61,6 +61,7 @@ "#4D5360", ], }, { + hidden: true, data: [ randomScalingFactor(), randomScalingFactor(), diff --git a/samples/line-x-axis-filter.html b/samples/line-x-axis-filter.html index 8135dbafe..508ed2b5c 100644 --- a/samples/line-x-axis-filter.html +++ b/samples/line-x-axis-filter.html @@ -54,8 +54,8 @@ xAxes: [{ display: true, ticks: { - callback: function(dataLabel, index) { - return dataLabel; + userCallback: function(dataLabel, index) { + return index % 2 === 0 ? dataLabel : ''; } } }], diff --git a/samples/line.html b/samples/line.html index 9e0cf17d7..1179e6bcc 100644 --- a/samples/line.html +++ b/samples/line.html @@ -48,6 +48,10 @@ data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()], fill: false, borderDash: [5, 5], + }, { + hidden: true, + label: 'hidden dataset', + data: [], }, { label: "My Second dataset", data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()], diff --git a/samples/radar.html b/samples/radar.html index c9b559aef..da45b3e8f 100644 --- a/samples/radar.html +++ b/samples/radar.html @@ -42,6 +42,10 @@ backgroundColor: "rgba(220,220,220,0.2)", pointBackgroundColor: "rgba(220,220,220,1)", data: [null, randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()] + }, { + label: 'Hidden dataset', + hidden: true, + data: [], }, { label: "My Second dataset", backgroundColor: "rgba(151,187,205,0.2)", @@ -49,7 +53,7 @@ hoverPointBackgroundColor: "#fff", pointHighlightStroke: "rgba(151,187,205,1)", data: [null, randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()] - }] + },] }, options: { scale: { -- 2.47.2