From: Jukka Kurkela Date: Mon, 23 Nov 2020 22:58:03 +0000 (+0200) Subject: Disable all plugins when options.plugins = false (#8098) X-Git-Tag: v3.0.0-beta.7~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=021561072b7e7b95169d7bfc566642e292885d93;p=thirdparty%2FChart.js.git Disable all plugins when options.plugins = false (#8098) Disabling all plugins when options.plugins = false --- diff --git a/docs/docs/developers/plugins.md b/docs/docs/developers/plugins.md index 0e4bb3316..cd3d62386 100644 --- a/docs/docs/developers/plugins.md +++ b/docs/docs/developers/plugins.md @@ -106,6 +106,16 @@ var chart = new Chart(ctx, { }); ``` +To disable all plugins for a specific chart instance, set `options.plugins` to `false`: + +```javascript +var chart = new Chart(ctx, { + options: { + plugins: false // all plugins are disabled for this instance + } +}); +``` + ## Plugin Core API Read more about the [existing plugin extension hooks](../jsdoc/IPlugin.html). diff --git a/src/core/core.plugins.js b/src/core/core.plugins.js index cb4a905fc..b7839d356 100644 --- a/src/core/core.plugins.js +++ b/src/core/core.plugins.js @@ -1,6 +1,6 @@ import defaults from './core.defaults'; import registry from './core.registry'; -import {mergeIf} from '../helpers/helpers.core'; +import {mergeIf, valueOrDefault} from '../helpers/helpers.core'; /** * @typedef { import("./core.controller").default } Chart @@ -51,9 +51,10 @@ export default class PluginService { } const config = chart && chart.config; - const options = (config.options && config.options.plugins) || {}; + const options = valueOrDefault(config.options && config.options.plugins, {}); const plugins = allPlugins(config); - const descriptors = createDescriptors(plugins, options); + // options === false => all plugins are disabled + const descriptors = options === false ? [] : createDescriptors(plugins, options); this._cache = descriptors; diff --git a/test/fixture.js b/test/fixture.js index c6055d1cc..334b682b9 100644 --- a/test/fixture.js +++ b/test/fixture.js @@ -43,7 +43,16 @@ function specFromFixture(description, inputs) { it(input, function(done) { loadConfig(input, function(json) { var descr = json.description || (json.description = description); - var chart = utils.acquireChart(json.config, json.options); + + var config = json.config; + var options = config.options || (config.options = {}); + + // plugins are disabled by default, except if the path contains 'plugin' or there are instance plugins + if (input.indexOf('plugin') === -1 && config.plugins === undefined) { + options.plugins = options.plugins || false; + } + + var chart = utils.acquireChart(config, json.options); if (!inputs.png) { fail(descr + '\r\nMissing PNG comparison file for ' + input); done(); diff --git a/test/fixtures/controller.bar/backgroundColor/indexable.js b/test/fixtures/controller.bar/backgroundColor/indexable.js index b686f8411..a3a2bbeaf 100644 --- a/test/fixtures/controller.bar/backgroundColor/indexable.js +++ b/test/fixtures/controller.bar/backgroundColor/indexable.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: [ diff --git a/test/fixtures/controller.bar/backgroundColor/loopable.js b/test/fixtures/controller.bar/backgroundColor/loopable.js index 685a0c126..78616b6fe 100644 --- a/test/fixtures/controller.bar/backgroundColor/loopable.js +++ b/test/fixtures/controller.bar/backgroundColor/loopable.js @@ -20,8 +20,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: [ diff --git a/test/fixtures/controller.bar/backgroundColor/scriptable.js b/test/fixtures/controller.bar/backgroundColor/scriptable.js index 9e2cbe5fc..4f9d9e5ce 100644 --- a/test/fixtures/controller.bar/backgroundColor/scriptable.js +++ b/test/fixtures/controller.bar/backgroundColor/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: function(ctx) { diff --git a/test/fixtures/controller.bar/backgroundColor/value.js b/test/fixtures/controller.bar/backgroundColor/value.js index b6d41aa39..0a56893aa 100644 --- a/test/fixtures/controller.bar/backgroundColor/value.js +++ b/test/fixtures/controller.bar/backgroundColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: '#00ff00' diff --git a/test/fixtures/controller.bar/bar-base-value.js b/test/fixtures/controller.bar/bar-base-value.js index 0bb96dc6e..568422338 100644 --- a/test/fixtures/controller.bar/bar-base-value.js +++ b/test/fixtures/controller.bar/bar-base-value.js @@ -14,8 +14,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {display: false}, y: {display: false} diff --git a/test/fixtures/controller.bar/bar-default-begin-at-zero.js b/test/fixtures/controller.bar/bar-default-begin-at-zero.js index 1f3e21d97..acd24711a 100644 --- a/test/fixtures/controller.bar/bar-default-begin-at-zero.js +++ b/test/fixtures/controller.bar/bar-default-begin-at-zero.js @@ -12,8 +12,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {display: false}, y: {display: false} diff --git a/test/fixtures/controller.bar/bar-skip-null-object-data.js b/test/fixtures/controller.bar/bar-skip-null-object-data.js index 8690aec27..b0b52688c 100644 --- a/test/fixtures/controller.bar/bar-skip-null-object-data.js +++ b/test/fixtures/controller.bar/bar-skip-null-object-data.js @@ -16,9 +16,7 @@ module.exports = { ] }, options: { - legend: false, skipNull: true, - title: false, scales: { x: {display: false}, y: {display: false} diff --git a/test/fixtures/controller.bar/bar-skip-null.js b/test/fixtures/controller.bar/bar-skip-null.js index 77f029044..4205a1627 100644 --- a/test/fixtures/controller.bar/bar-skip-null.js +++ b/test/fixtures/controller.bar/bar-skip-null.js @@ -17,9 +17,7 @@ module.exports = { ] }, options: { - legend: false, skipNull: true, - title: false, scales: { x: {display: false}, y: {display: false} diff --git a/test/fixtures/controller.bar/bar-thickness-absolute.json b/test/fixtures/controller.bar/bar-thickness-absolute.json index 1a88ddb37..c53d97641 100644 --- a/test/fixtures/controller.bar/bar-thickness-absolute.json +++ b/test/fixtures/controller.bar/bar-thickness-absolute.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-flex-offset.json b/test/fixtures/controller.bar/bar-thickness-flex-offset.json index ea5870b4d..c4c9e894c 100644 --- a/test/fixtures/controller.bar/bar-thickness-flex-offset.json +++ b/test/fixtures/controller.bar/bar-thickness-flex-offset.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-flex-single-reverse.json b/test/fixtures/controller.bar/bar-thickness-flex-single-reverse.json index e14aabab6..a463037f3 100644 --- a/test/fixtures/controller.bar/bar-thickness-flex-single-reverse.json +++ b/test/fixtures/controller.bar/bar-thickness-flex-single-reverse.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-flex-single.json b/test/fixtures/controller.bar/bar-thickness-flex-single.json index 9ae6ceaf5..8c3be0fd1 100644 --- a/test/fixtures/controller.bar/bar-thickness-flex-single.json +++ b/test/fixtures/controller.bar/bar-thickness-flex-single.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-flex.json b/test/fixtures/controller.bar/bar-thickness-flex.json index 5c329302d..d81cb1b35 100644 --- a/test/fixtures/controller.bar/bar-thickness-flex.json +++ b/test/fixtures/controller.bar/bar-thickness-flex.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-max.json b/test/fixtures/controller.bar/bar-thickness-max.json index a3e736887..65575a0cc 100644 --- a/test/fixtures/controller.bar/bar-thickness-max.json +++ b/test/fixtures/controller.bar/bar-thickness-max.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-min-interval-multi.json b/test/fixtures/controller.bar/bar-thickness-min-interval-multi.json index 6868b8e99..7d59b72e8 100644 --- a/test/fixtures/controller.bar/bar-thickness-min-interval-multi.json +++ b/test/fixtures/controller.bar/bar-thickness-min-interval-multi.json @@ -16,8 +16,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-min-interval.json b/test/fixtures/controller.bar/bar-thickness-min-interval.json index d01ae930a..887ddc1c2 100644 --- a/test/fixtures/controller.bar/bar-thickness-min-interval.json +++ b/test/fixtures/controller.bar/bar-thickness-min-interval.json @@ -12,8 +12,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-multiple.json b/test/fixtures/controller.bar/bar-thickness-multiple.json index ba9d783d0..3cf2e7df6 100644 --- a/test/fixtures/controller.bar/bar-thickness-multiple.json +++ b/test/fixtures/controller.bar/bar-thickness-multiple.json @@ -16,8 +16,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "bar": { "datasets": { "barPercentage": 1, diff --git a/test/fixtures/controller.bar/bar-thickness-no-overlap.json b/test/fixtures/controller.bar/bar-thickness-no-overlap.json index be67964a3..0849b850c 100644 --- a/test/fixtures/controller.bar/bar-thickness-no-overlap.json +++ b/test/fixtures/controller.bar/bar-thickness-no-overlap.json @@ -16,8 +16,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "bar": { "datasets": { "barPercentage": 1, diff --git a/test/fixtures/controller.bar/bar-thickness-offset.json b/test/fixtures/controller.bar/bar-thickness-offset.json index 54a2ddf58..574f3abb6 100644 --- a/test/fixtures/controller.bar/bar-thickness-offset.json +++ b/test/fixtures/controller.bar/bar-thickness-offset.json @@ -16,8 +16,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "bar": { "datasets": { "barPercentage": 1, diff --git a/test/fixtures/controller.bar/bar-thickness-per-dataset-stacked.json b/test/fixtures/controller.bar/bar-thickness-per-dataset-stacked.json index 21f990a34..64bd90964 100644 --- a/test/fixtures/controller.bar/bar-thickness-per-dataset-stacked.json +++ b/test/fixtures/controller.bar/bar-thickness-per-dataset-stacked.json @@ -21,8 +21,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-per-dataset.json b/test/fixtures/controller.bar/bar-thickness-per-dataset.json index 1d27989ed..cc26a65bf 100644 --- a/test/fixtures/controller.bar/bar-thickness-per-dataset.json +++ b/test/fixtures/controller.bar/bar-thickness-per-dataset.json @@ -16,8 +16,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-reverse.json b/test/fixtures/controller.bar/bar-thickness-reverse.json index c794e217c..6ae340f83 100644 --- a/test/fixtures/controller.bar/bar-thickness-reverse.json +++ b/test/fixtures/controller.bar/bar-thickness-reverse.json @@ -16,8 +16,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "bar": { "datasets": { "barPercentage": 1, diff --git a/test/fixtures/controller.bar/bar-thickness-single-xy.json b/test/fixtures/controller.bar/bar-thickness-single-xy.json index 4e1a97ab7..4e94cbc70 100644 --- a/test/fixtures/controller.bar/bar-thickness-single-xy.json +++ b/test/fixtures/controller.bar/bar-thickness-single-xy.json @@ -12,8 +12,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-single.json b/test/fixtures/controller.bar/bar-thickness-single.json index 8155ad811..0d9d01e7c 100644 --- a/test/fixtures/controller.bar/bar-thickness-single.json +++ b/test/fixtures/controller.bar/bar-thickness-single.json @@ -12,8 +12,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "type": "time", diff --git a/test/fixtures/controller.bar/bar-thickness-stacked.json b/test/fixtures/controller.bar/bar-thickness-stacked.json index 02ac19ccf..ddf4ff868 100644 --- a/test/fixtures/controller.bar/bar-thickness-stacked.json +++ b/test/fixtures/controller.bar/bar-thickness-stacked.json @@ -16,8 +16,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "bar": { "datasets": { "barPercentage": 1, diff --git a/test/fixtures/controller.bar/border-radius.js b/test/fixtures/controller.bar/border-radius.js index 67c579ff0..efe6afa9d 100644 --- a/test/fixtures/controller.bar/border-radius.js +++ b/test/fixtures/controller.bar/border-radius.js @@ -20,8 +20,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, indexAxis: 'y', elements: { bar: { diff --git a/test/fixtures/controller.bar/borderColor/indexable.js b/test/fixtures/controller.bar/borderColor/indexable.js index 84a6737be..f8ad9d01a 100644 --- a/test/fixtures/controller.bar/borderColor/indexable.js +++ b/test/fixtures/controller.bar/borderColor/indexable.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/borderColor/scriptable.js b/test/fixtures/controller.bar/borderColor/scriptable.js index cb090e715..9ba3dbcfd 100644 --- a/test/fixtures/controller.bar/borderColor/scriptable.js +++ b/test/fixtures/controller.bar/borderColor/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/borderColor/value.js b/test/fixtures/controller.bar/borderColor/value.js index 634611391..b8981e681 100644 --- a/test/fixtures/controller.bar/borderColor/value.js +++ b/test/fixtures/controller.bar/borderColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/borderSkipped/indexable.js b/test/fixtures/controller.bar/borderSkipped/indexable.js index 1f646854e..e9bddedef 100644 --- a/test/fixtures/controller.bar/borderSkipped/indexable.js +++ b/test/fixtures/controller.bar/borderSkipped/indexable.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/borderSkipped/scriptable.js b/test/fixtures/controller.bar/borderSkipped/scriptable.js index 0f04955d6..3aa5a5222 100644 --- a/test/fixtures/controller.bar/borderSkipped/scriptable.js +++ b/test/fixtures/controller.bar/borderSkipped/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/borderSkipped/value.js b/test/fixtures/controller.bar/borderSkipped/value.js index 80f1ccffc..3e0602eb9 100644 --- a/test/fixtures/controller.bar/borderSkipped/value.js +++ b/test/fixtures/controller.bar/borderSkipped/value.js @@ -31,8 +31,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/borderWidth/indexable-object.js b/test/fixtures/controller.bar/borderWidth/indexable-object.js index 022a4a45b..6e7b6ad84 100644 --- a/test/fixtures/controller.bar/borderWidth/indexable-object.js +++ b/test/fixtures/controller.bar/borderWidth/indexable-object.js @@ -24,8 +24,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/borderWidth/indexable.js b/test/fixtures/controller.bar/borderWidth/indexable.js index bb2bf5a46..b6f87da59 100644 --- a/test/fixtures/controller.bar/borderWidth/indexable.js +++ b/test/fixtures/controller.bar/borderWidth/indexable.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/borderWidth/negative.js b/test/fixtures/controller.bar/borderWidth/negative.js index 6c2d1673e..39dc68fe5 100644 --- a/test/fixtures/controller.bar/borderWidth/negative.js +++ b/test/fixtures/controller.bar/borderWidth/negative.js @@ -25,8 +25,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: '#888', diff --git a/test/fixtures/controller.bar/borderWidth/object.js b/test/fixtures/controller.bar/borderWidth/object.js index f88fd6670..c69c6c537 100644 --- a/test/fixtures/controller.bar/borderWidth/object.js +++ b/test/fixtures/controller.bar/borderWidth/object.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/borderWidth/scriptable-object.js b/test/fixtures/controller.bar/borderWidth/scriptable-object.js index b98acbf82..a9a515477 100644 --- a/test/fixtures/controller.bar/borderWidth/scriptable-object.js +++ b/test/fixtures/controller.bar/borderWidth/scriptable-object.js @@ -20,8 +20,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/borderWidth/scriptable.js b/test/fixtures/controller.bar/borderWidth/scriptable.js index 8897b386d..f2492b96b 100644 --- a/test/fixtures/controller.bar/borderWidth/scriptable.js +++ b/test/fixtures/controller.bar/borderWidth/scriptable.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/borderWidth/value.js b/test/fixtures/controller.bar/borderWidth/value.js index a3b0e0db6..bfedc41ad 100644 --- a/test/fixtures/controller.bar/borderWidth/value.js +++ b/test/fixtures/controller.bar/borderWidth/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { bar: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.bar/chart-area-clip.js b/test/fixtures/controller.bar/chart-area-clip.js index 9d255fa49..ecd2c1b7d 100644 --- a/test/fixtures/controller.bar/chart-area-clip.js +++ b/test/fixtures/controller.bar/chart-area-clip.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, layout: { padding: { left: 0, diff --git a/test/fixtures/controller.bar/data/object.js b/test/fixtures/controller.bar/data/object.js index 368af5660..bba10f006 100644 --- a/test/fixtures/controller.bar/data/object.js +++ b/test/fixtures/controller.bar/data/object.js @@ -15,8 +15,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {display: false}, y: {display: false} diff --git a/test/fixtures/controller.bar/data/parsing.js b/test/fixtures/controller.bar/data/parsing.js index aecab69b3..adf3a67a6 100644 --- a/test/fixtures/controller.bar/data/parsing.js +++ b/test/fixtures/controller.bar/data/parsing.js @@ -29,8 +29,6 @@ module.exports = { }] }, options: { - legend: false, - title: false, scales: { x: {display: false}, y: {display: false} diff --git a/test/fixtures/controller.bar/floatBar/data-as-objects-horizontal.js b/test/fixtures/controller.bar/floatBar/data-as-objects-horizontal.js index 0a258ab96..16a67c438 100644 --- a/test/fixtures/controller.bar/floatBar/data-as-objects-horizontal.js +++ b/test/fixtures/controller.bar/floatBar/data-as-objects-horizontal.js @@ -15,8 +15,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, indexAxis: 'y', scales: { x: {display: false, min: 0}, diff --git a/test/fixtures/controller.bar/floatBar/data-as-objects.js b/test/fixtures/controller.bar/floatBar/data-as-objects.js index 08868b7d9..9d6fd63ca 100644 --- a/test/fixtures/controller.bar/floatBar/data-as-objects.js +++ b/test/fixtures/controller.bar/floatBar/data-as-objects.js @@ -15,8 +15,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {display: false, stacked: true}, y: {display: false, min: 0} diff --git a/test/fixtures/controller.bar/floatBar/float-bar-horizontal.json b/test/fixtures/controller.bar/floatBar/float-bar-horizontal.json index e2e35e1d2..8142c8db6 100644 --- a/test/fixtures/controller.bar/floatBar/float-bar-horizontal.json +++ b/test/fixtures/controller.bar/floatBar/float-bar-horizontal.json @@ -15,8 +15,6 @@ }] }, "options": { - "title": false, - "legend": false, "indexAxis": "y", "scales": { "x": { diff --git a/test/fixtures/controller.bar/floatBar/float-bar-stacked-horizontal.json b/test/fixtures/controller.bar/floatBar/float-bar-stacked-horizontal.json index bbf8cb228..acaf00c9b 100644 --- a/test/fixtures/controller.bar/floatBar/float-bar-stacked-horizontal.json +++ b/test/fixtures/controller.bar/floatBar/float-bar-stacked-horizontal.json @@ -15,8 +15,6 @@ }] }, "options": { - "title": false, - "legend": false, "indexAxis": "y", "scales": { "x": { diff --git a/test/fixtures/controller.bar/floatBar/float-bar-stacked.json b/test/fixtures/controller.bar/floatBar/float-bar-stacked.json index 5c198beda..d2270e26f 100644 --- a/test/fixtures/controller.bar/floatBar/float-bar-stacked.json +++ b/test/fixtures/controller.bar/floatBar/float-bar-stacked.json @@ -15,8 +15,6 @@ }] }, "options": { - "title": false, - "legend": false, "scales": { "x": { "display": false, diff --git a/test/fixtures/controller.bar/floatBar/float-bar.json b/test/fixtures/controller.bar/floatBar/float-bar.json index 3ca6763b7..45b7fd850 100644 --- a/test/fixtures/controller.bar/floatBar/float-bar.json +++ b/test/fixtures/controller.bar/floatBar/float-bar.json @@ -15,8 +15,6 @@ }] }, "options": { - "title": false, - "legend": false, "scales": { "x": { "display": false, diff --git a/test/fixtures/controller.bar/horizontal-borders.js b/test/fixtures/controller.bar/horizontal-borders.js index 5d9d23b1f..894d121e8 100644 --- a/test/fixtures/controller.bar/horizontal-borders.js +++ b/test/fixtures/controller.bar/horizontal-borders.js @@ -18,8 +18,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, indexAxis: 'y', elements: { bar: { diff --git a/test/fixtures/controller.bar/minBarLength/horizontal-neg.js b/test/fixtures/controller.bar/minBarLength/horizontal-neg.js index 8cfba0f0d..0d8feddb1 100644 --- a/test/fixtures/controller.bar/minBarLength/horizontal-neg.js +++ b/test/fixtures/controller.bar/minBarLength/horizontal-neg.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, indexAxis: 'y', scales: { x: { diff --git a/test/fixtures/controller.bar/minBarLength/horizontal-pos.js b/test/fixtures/controller.bar/minBarLength/horizontal-pos.js index c5f964955..a76feb107 100644 --- a/test/fixtures/controller.bar/minBarLength/horizontal-pos.js +++ b/test/fixtures/controller.bar/minBarLength/horizontal-pos.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, indexAxis: 'y', scales: { x: { diff --git a/test/fixtures/controller.bar/minBarLength/horizontal.js b/test/fixtures/controller.bar/minBarLength/horizontal.js index 789b484c4..2535bcba5 100644 --- a/test/fixtures/controller.bar/minBarLength/horizontal.js +++ b/test/fixtures/controller.bar/minBarLength/horizontal.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, indexAxis: 'y', scales: { x: { diff --git a/test/fixtures/controller.bar/minBarLength/vertical-neg.js b/test/fixtures/controller.bar/minBarLength/vertical-neg.js index f5976b5ac..7ae3897b8 100644 --- a/test/fixtures/controller.bar/minBarLength/vertical-neg.js +++ b/test/fixtures/controller.bar/minBarLength/vertical-neg.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {display: false}, y: { diff --git a/test/fixtures/controller.bar/minBarLength/vertical-pos.js b/test/fixtures/controller.bar/minBarLength/vertical-pos.js index 7d69b2920..07a03c4fd 100644 --- a/test/fixtures/controller.bar/minBarLength/vertical-pos.js +++ b/test/fixtures/controller.bar/minBarLength/vertical-pos.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {display: false}, y: { diff --git a/test/fixtures/controller.bar/minBarLength/vertical.js b/test/fixtures/controller.bar/minBarLength/vertical.js index 29da8a6e1..ff808c7b5 100644 --- a/test/fixtures/controller.bar/minBarLength/vertical.js +++ b/test/fixtures/controller.bar/minBarLength/vertical.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {display: false}, y: { diff --git a/test/fixtures/controller.bar/stacking/logarithmic-strings.js b/test/fixtures/controller.bar/stacking/logarithmic-strings.js index ec90866f5..aa92af956 100644 --- a/test/fixtures/controller.bar/stacking/logarithmic-strings.js +++ b/test/fixtures/controller.bar/stacking/logarithmic-strings.js @@ -12,8 +12,6 @@ module.exports = { labels: ['label1', 'label2', 'label3', 'label4'] }, options: { - legend: false, - title: false, bar: { datasets: { barPercentage: 1, diff --git a/test/fixtures/controller.bar/stacking/logarithmic.js b/test/fixtures/controller.bar/stacking/logarithmic.js index 375179fd6..9e594c277 100644 --- a/test/fixtures/controller.bar/stacking/logarithmic.js +++ b/test/fixtures/controller.bar/stacking/logarithmic.js @@ -12,8 +12,6 @@ module.exports = { labels: ['label1', 'label2', 'label3', 'label4'] }, options: { - legend: false, - title: false, bar: { datasets: { barPercentage: 1, diff --git a/test/fixtures/controller.bar/stacking/order-default.json b/test/fixtures/controller.bar/stacking/order-default.json index 4a0e13ded..18fbe9cf6 100644 --- a/test/fixtures/controller.bar/stacking/order-default.json +++ b/test/fixtures/controller.bar/stacking/order-default.json @@ -16,8 +16,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "display": false, diff --git a/test/fixtures/controller.bar/stacking/order-specified.json b/test/fixtures/controller.bar/stacking/order-specified.json index 4d7e79518..6daf0eab8 100644 --- a/test/fixtures/controller.bar/stacking/order-specified.json +++ b/test/fixtures/controller.bar/stacking/order-specified.json @@ -19,8 +19,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "display": false, diff --git a/test/fixtures/controller.bubble/clip.js b/test/fixtures/controller.bubble/clip.js index 349722647..4a9d5090e 100644 --- a/test/fixtures/controller.bubble/clip.js +++ b/test/fixtures/controller.bubble/clip.js @@ -12,7 +12,6 @@ module.exports = { }] }, options: { - legend: false, scales: { x: {ticks: {display: false}}, y: { diff --git a/test/fixtures/controller.bubble/point-style.json b/test/fixtures/controller.bubble/point-style.json index 71de48a88..d341eb11a 100644 --- a/test/fixtures/controller.bubble/point-style.json +++ b/test/fixtures/controller.bubble/point-style.json @@ -90,8 +90,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": {"display": false}, "y": { diff --git a/test/fixtures/controller.bubble/radius-data.js b/test/fixtures/controller.bubble/radius-data.js index 65f61d771..b1da990c6 100644 --- a/test/fixtures/controller.bubble/radius-data.js +++ b/test/fixtures/controller.bubble/radius-data.js @@ -18,8 +18,6 @@ module.exports = { }] }, options: { - legend: false, - title: false, scales: { x: {display: false}, y: {display: false} diff --git a/test/fixtures/controller.bubble/radius-scriptable.js b/test/fixtures/controller.bubble/radius-scriptable.js index 021b67821..5706cb00d 100644 --- a/test/fixtures/controller.bubble/radius-scriptable.js +++ b/test/fixtures/controller.bubble/radius-scriptable.js @@ -17,8 +17,6 @@ module.exports = { }] }, options: { - legend: false, - title: false, scales: { x: {display: false}, y: {display: false} diff --git a/test/fixtures/controller.doughnut/backgroundColor/indexable.js b/test/fixtures/controller.doughnut/backgroundColor/indexable.js index 30262af86..7399d7953 100644 --- a/test/fixtures/controller.doughnut/backgroundColor/indexable.js +++ b/test/fixtures/controller.doughnut/backgroundColor/indexable.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: [ diff --git a/test/fixtures/controller.doughnut/backgroundColor/scriptable.js b/test/fixtures/controller.doughnut/backgroundColor/scriptable.js index e2cf9a247..108352334 100644 --- a/test/fixtures/controller.doughnut/backgroundColor/scriptable.js +++ b/test/fixtures/controller.doughnut/backgroundColor/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: function(ctx) { diff --git a/test/fixtures/controller.doughnut/backgroundColor/value.js b/test/fixtures/controller.doughnut/backgroundColor/value.js index 0abc394fb..3bf4d3e47 100644 --- a/test/fixtures/controller.doughnut/backgroundColor/value.js +++ b/test/fixtures/controller.doughnut/backgroundColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: '#00ff00' diff --git a/test/fixtures/controller.doughnut/borderAlign/indexable.js b/test/fixtures/controller.doughnut/borderAlign/indexable.js index dd7798ed4..4f9d55729 100644 --- a/test/fixtures/controller.doughnut/borderAlign/indexable.js +++ b/test/fixtures/controller.doughnut/borderAlign/indexable.js @@ -24,8 +24,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.doughnut/borderAlign/scriptable.js b/test/fixtures/controller.doughnut/borderAlign/scriptable.js index 29582d12b..81d14fba3 100644 --- a/test/fixtures/controller.doughnut/borderAlign/scriptable.js +++ b/test/fixtures/controller.doughnut/borderAlign/scriptable.js @@ -20,8 +20,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.doughnut/borderAlign/value.js b/test/fixtures/controller.doughnut/borderAlign/value.js index 6a3d5334e..6271ddbe9 100644 --- a/test/fixtures/controller.doughnut/borderAlign/value.js +++ b/test/fixtures/controller.doughnut/borderAlign/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.doughnut/borderColor/indexable.js b/test/fixtures/controller.doughnut/borderColor/indexable.js index d5cfb8022..2d6a8cddf 100644 --- a/test/fixtures/controller.doughnut/borderColor/indexable.js +++ b/test/fixtures/controller.doughnut/borderColor/indexable.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.doughnut/borderColor/scriptable.js b/test/fixtures/controller.doughnut/borderColor/scriptable.js index a6dc8cc3c..048088931 100644 --- a/test/fixtures/controller.doughnut/borderColor/scriptable.js +++ b/test/fixtures/controller.doughnut/borderColor/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.doughnut/borderColor/value.js b/test/fixtures/controller.doughnut/borderColor/value.js index 066ea8de4..fbe14eacb 100644 --- a/test/fixtures/controller.doughnut/borderColor/value.js +++ b/test/fixtures/controller.doughnut/borderColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.doughnut/borderWidth/indexable.js b/test/fixtures/controller.doughnut/borderWidth/indexable.js index 28f82c64f..04b546fc8 100644 --- a/test/fixtures/controller.doughnut/borderWidth/indexable.js +++ b/test/fixtures/controller.doughnut/borderWidth/indexable.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.doughnut/borderWidth/scriptable.js b/test/fixtures/controller.doughnut/borderWidth/scriptable.js index 545c8d201..41e6fca19 100644 --- a/test/fixtures/controller.doughnut/borderWidth/scriptable.js +++ b/test/fixtures/controller.doughnut/borderWidth/scriptable.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.doughnut/borderWidth/value.js b/test/fixtures/controller.doughnut/borderWidth/value.js index 4d7d285c6..ac4844370 100644 --- a/test/fixtures/controller.doughnut/borderWidth/value.js +++ b/test/fixtures/controller.doughnut/borderWidth/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.doughnut/doughnut-border-align-center.json b/test/fixtures/controller.doughnut/doughnut-border-align-center.json index b76b2e82f..cf3fa14cc 100644 --- a/test/fixtures/controller.doughnut/doughnut-border-align-center.json +++ b/test/fixtures/controller.doughnut/doughnut-border-align-center.json @@ -23,9 +23,7 @@ }] }, "options": { - "responsive": false, - "legend": false, - "title": false + "responsive": false } } } diff --git a/test/fixtures/controller.doughnut/doughnut-border-align-inner.json b/test/fixtures/controller.doughnut/doughnut-border-align-inner.json index 7fb4a76e1..6d6c9c0f6 100644 --- a/test/fixtures/controller.doughnut/doughnut-border-align-inner.json +++ b/test/fixtures/controller.doughnut/doughnut-border-align-inner.json @@ -24,9 +24,7 @@ }] }, "options": { - "responsive": false, - "legend": false, - "title": false + "responsive": false } } } diff --git a/test/fixtures/controller.doughnut/doughnut-circumference-over-2pi.json b/test/fixtures/controller.doughnut/doughnut-circumference-over-2pi.json index c7f37d485..5490cac29 100644 --- a/test/fixtures/controller.doughnut/doughnut-circumference-over-2pi.json +++ b/test/fixtures/controller.doughnut/doughnut-circumference-over-2pi.json @@ -16,9 +16,7 @@ }, "options": { "circumference": 400, - "responsive": false, - "legend": false, - "title": false + "responsive": false } } } diff --git a/test/fixtures/controller.doughnut/doughnut-circumference-per-dataset.js b/test/fixtures/controller.doughnut/doughnut-circumference-per-dataset.js index 526c15b1e..0b137ebbe 100644 --- a/test/fixtures/controller.doughnut/doughnut-circumference-per-dataset.js +++ b/test/fixtures/controller.doughnut/doughnut-circumference-per-dataset.js @@ -25,9 +25,7 @@ module.exports = { }, options: { circumference: 57.32, - responsive: false, - legend: false, - title: false + responsive: false } } }; diff --git a/test/fixtures/controller.doughnut/doughnut-circumference.json b/test/fixtures/controller.doughnut/doughnut-circumference.json index c6073a4f9..aa623de6a 100644 --- a/test/fixtures/controller.doughnut/doughnut-circumference.json +++ b/test/fixtures/controller.doughnut/doughnut-circumference.json @@ -24,9 +24,7 @@ }, "options": { "circumference": 57.32, - "responsive": false, - "legend": false, - "title": false + "responsive": false } } } diff --git a/test/fixtures/controller.doughnut/doughnut-hidden.js b/test/fixtures/controller.doughnut/doughnut-hidden.js index d9b871c22..9ba987902 100644 --- a/test/fixtures/controller.doughnut/doughnut-hidden.js +++ b/test/fixtures/controller.doughnut/doughnut-hidden.js @@ -24,8 +24,12 @@ module.exports = { }, options: { responsive: false, - legend: false, - title: false + plugins: { + legend: false, + title: false, + tooltip: false, + filler: false + } }, plugins: [{ id: 'hide', diff --git a/test/fixtures/controller.doughnut/doughnut-rotation-per-dataset.js b/test/fixtures/controller.doughnut/doughnut-rotation-per-dataset.js index fa6d103c7..57f60e952 100644 --- a/test/fixtures/controller.doughnut/doughnut-rotation-per-dataset.js +++ b/test/fixtures/controller.doughnut/doughnut-rotation-per-dataset.js @@ -43,9 +43,7 @@ module.exports = { }, options: { circumference: 180, - responsive: false, - legend: false, - title: false + responsive: false } } }; diff --git a/test/fixtures/controller.doughnut/doughnut-weight.json b/test/fixtures/controller.doughnut/doughnut-weight.json index 769814b0c..468f78d78 100644 --- a/test/fixtures/controller.doughnut/doughnut-weight.json +++ b/test/fixtures/controller.doughnut/doughnut-weight.json @@ -35,10 +35,6 @@ "borderWidth": 0 }], "labels": [ "label0", "label1" ] - }, - "options": { - "legend": false, - "title": false } }, "options": { @@ -47,4 +43,4 @@ "width": 500 } } -} \ No newline at end of file +} diff --git a/test/fixtures/controller.doughnut/pie-border-align-center.json b/test/fixtures/controller.doughnut/pie-border-align-center.json index 59ecf544c..3ea498b89 100644 --- a/test/fixtures/controller.doughnut/pie-border-align-center.json +++ b/test/fixtures/controller.doughnut/pie-border-align-center.json @@ -23,9 +23,7 @@ }] }, "options": { - "responsive": false, - "legend": false, - "title": false + "responsive": false } } } diff --git a/test/fixtures/controller.doughnut/pie-border-align-inner.json b/test/fixtures/controller.doughnut/pie-border-align-inner.json index 7b1bd0361..ed91a9567 100644 --- a/test/fixtures/controller.doughnut/pie-border-align-inner.json +++ b/test/fixtures/controller.doughnut/pie-border-align-inner.json @@ -25,8 +25,11 @@ }, "options": { "responsive": false, - "legend": false, - "title": false + "plugins": { + "legend": false, + "title": false, + "tooltip": false + } } } } diff --git a/test/fixtures/controller.doughnut/pie-circumference.json b/test/fixtures/controller.doughnut/pie-circumference.json index 328718645..39405f1fe 100644 --- a/test/fixtures/controller.doughnut/pie-circumference.json +++ b/test/fixtures/controller.doughnut/pie-circumference.json @@ -24,9 +24,7 @@ }, "options": { "circumference": 57.32, - "responsive": false, - "legend": false, - "title": false + "responsive": false } } } diff --git a/test/fixtures/controller.doughnut/pie-weight.json b/test/fixtures/controller.doughnut/pie-weight.json index 91d6c110b..6abcbc95d 100644 --- a/test/fixtures/controller.doughnut/pie-weight.json +++ b/test/fixtures/controller.doughnut/pie-weight.json @@ -37,10 +37,6 @@ } ], "labels": [ "label0", "label1" ] - }, - "options": { - "legend": false, - "title": false } }, "options": { @@ -49,4 +45,4 @@ "width": 500 } } -} \ No newline at end of file +} diff --git a/test/fixtures/controller.line/backgroundColor/scriptable.js b/test/fixtures/controller.line/backgroundColor/scriptable.js index a1844973a..ab1ab1580 100644 --- a/test/fixtures/controller.line/backgroundColor/scriptable.js +++ b/test/fixtures/controller.line/backgroundColor/scriptable.js @@ -21,8 +21,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { backgroundColor: function(ctx) { @@ -46,6 +44,12 @@ module.exports = { display: false, beginAtZero: true } + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.line/backgroundColor/value.js b/test/fixtures/controller.line/backgroundColor/value.js index 1931c343f..b92a0111f 100644 --- a/test/fixtures/controller.line/backgroundColor/value.js +++ b/test/fixtures/controller.line/backgroundColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { backgroundColor: '#00ff00' @@ -32,6 +30,12 @@ module.exports = { scales: { x: {display: false}, y: {display: false} + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.line/borderCapStyle/scriptable.js b/test/fixtures/controller.line/borderCapStyle/scriptable.js index 49d0f07ae..cb31c79d0 100644 --- a/test/fixtures/controller.line/borderCapStyle/scriptable.js +++ b/test/fixtures/controller.line/borderCapStyle/scriptable.js @@ -25,8 +25,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderCapStyle: function(ctx) { diff --git a/test/fixtures/controller.line/borderCapStyle/value.js b/test/fixtures/controller.line/borderCapStyle/value.js index 16393fed5..2f0e514bd 100644 --- a/test/fixtures/controller.line/borderCapStyle/value.js +++ b/test/fixtures/controller.line/borderCapStyle/value.js @@ -21,8 +21,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderCapStyle: 'butt', diff --git a/test/fixtures/controller.line/borderColor/scriptable.js b/test/fixtures/controller.line/borderColor/scriptable.js index 33941b9f5..d87fd183a 100644 --- a/test/fixtures/controller.line/borderColor/scriptable.js +++ b/test/fixtures/controller.line/borderColor/scriptable.js @@ -21,8 +21,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: function(ctx) { diff --git a/test/fixtures/controller.line/borderColor/value.js b/test/fixtures/controller.line/borderColor/value.js index 4dfab4c23..9f58e2427 100644 --- a/test/fixtures/controller.line/borderColor/value.js +++ b/test/fixtures/controller.line/borderColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#0000ff', diff --git a/test/fixtures/controller.line/borderDash/scriptable.js b/test/fixtures/controller.line/borderDash/scriptable.js index da003ea91..127414872 100644 --- a/test/fixtures/controller.line/borderDash/scriptable.js +++ b/test/fixtures/controller.line/borderDash/scriptable.js @@ -18,8 +18,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.line/borderDash/value.js b/test/fixtures/controller.line/borderDash/value.js index d40c87721..9d1f8a6eb 100644 --- a/test/fixtures/controller.line/borderDash/value.js +++ b/test/fixtures/controller.line/borderDash/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.line/borderDashOffset/scriptable.js b/test/fixtures/controller.line/borderDashOffset/scriptable.js index f3f8ba6e4..4e56559db 100644 --- a/test/fixtures/controller.line/borderDashOffset/scriptable.js +++ b/test/fixtures/controller.line/borderDashOffset/scriptable.js @@ -20,8 +20,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.line/borderDashOffset/value.js b/test/fixtures/controller.line/borderDashOffset/value.js index 67f9f6550..89718503a 100644 --- a/test/fixtures/controller.line/borderDashOffset/value.js +++ b/test/fixtures/controller.line/borderDashOffset/value.js @@ -18,8 +18,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.line/borderJoinStyle/scriptable.js b/test/fixtures/controller.line/borderJoinStyle/scriptable.js index 54468482e..fd80e765d 100644 --- a/test/fixtures/controller.line/borderJoinStyle/scriptable.js +++ b/test/fixtures/controller.line/borderJoinStyle/scriptable.js @@ -27,8 +27,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.line/borderJoinStyle/value.js b/test/fixtures/controller.line/borderJoinStyle/value.js index b9b8e3533..3175f0f3b 100644 --- a/test/fixtures/controller.line/borderJoinStyle/value.js +++ b/test/fixtures/controller.line/borderJoinStyle/value.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.line/borderWidth/scriptable.js b/test/fixtures/controller.line/borderWidth/scriptable.js index f4167d7c0..cef7246d6 100644 --- a/test/fixtures/controller.line/borderWidth/scriptable.js +++ b/test/fixtures/controller.line/borderWidth/scriptable.js @@ -21,8 +21,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#ff0000', diff --git a/test/fixtures/controller.line/borderWidth/value.js b/test/fixtures/controller.line/borderWidth/value.js index 872f8b251..67bd66bb3 100644 --- a/test/fixtures/controller.line/borderWidth/value.js +++ b/test/fixtures/controller.line/borderWidth/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.line/borderWidth/zero.js b/test/fixtures/controller.line/borderWidth/zero.js index 35cfc7da0..b5b821dea 100644 --- a/test/fixtures/controller.line/borderWidth/zero.js +++ b/test/fixtures/controller.line/borderWidth/zero.js @@ -18,8 +18,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.line/clip/default-x-max.json b/test/fixtures/controller.line/clip/default-x-max.json index ea8f541a3..e353be2b6 100644 --- a/test/fixtures/controller.line/clip/default-x-max.json +++ b/test/fixtures/controller.line/clip/default-x-max.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "max": 3, diff --git a/test/fixtures/controller.line/clip/default-x-min.json b/test/fixtures/controller.line/clip/default-x-min.json index 65d85cc88..9c0a95ebd 100644 --- a/test/fixtures/controller.line/clip/default-x-min.json +++ b/test/fixtures/controller.line/clip/default-x-min.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "min": -2, diff --git a/test/fixtures/controller.line/clip/default-x.json b/test/fixtures/controller.line/clip/default-x.json index 5a8e2c16a..7d7530796 100644 --- a/test/fixtures/controller.line/clip/default-x.json +++ b/test/fixtures/controller.line/clip/default-x.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "min": -2, diff --git a/test/fixtures/controller.line/clip/default-y-max.json b/test/fixtures/controller.line/clip/default-y-max.json index 8fe92a4d6..5fb441fbe 100644 --- a/test/fixtures/controller.line/clip/default-y-max.json +++ b/test/fixtures/controller.line/clip/default-y-max.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": {"ticks": {"display": false}}, "y": { diff --git a/test/fixtures/controller.line/clip/default-y-min.json b/test/fixtures/controller.line/clip/default-y-min.json index 1d7f78363..622dd0d92 100644 --- a/test/fixtures/controller.line/clip/default-y-min.json +++ b/test/fixtures/controller.line/clip/default-y-min.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": {"ticks": {"display": false}}, "y": { diff --git a/test/fixtures/controller.line/clip/default-y.json b/test/fixtures/controller.line/clip/default-y.json index 44034c657..0a4eb17e0 100644 --- a/test/fixtures/controller.line/clip/default-y.json +++ b/test/fixtures/controller.line/clip/default-y.json @@ -13,8 +13,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": {"ticks": {"display": false}}, "y": { diff --git a/test/fixtures/controller.line/clip/specified.json b/test/fixtures/controller.line/clip/specified.json index 2c34d3d0b..53f4917f2 100644 --- a/test/fixtures/controller.line/clip/specified.json +++ b/test/fixtures/controller.line/clip/specified.json @@ -36,8 +36,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": { "min": -2, diff --git a/test/fixtures/controller.line/cubicInterpolationMode/scriptable.js b/test/fixtures/controller.line/cubicInterpolationMode/scriptable.js index d2dfd54b1..f01007630 100644 --- a/test/fixtures/controller.line/cubicInterpolationMode/scriptable.js +++ b/test/fixtures/controller.line/cubicInterpolationMode/scriptable.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.line/cubicInterpolationMode/value.js b/test/fixtures/controller.line/cubicInterpolationMode/value.js index 516eb9797..f0d914389 100644 --- a/test/fixtures/controller.line/cubicInterpolationMode/value.js +++ b/test/fixtures/controller.line/cubicInterpolationMode/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.line/fill/order-default.js b/test/fixtures/controller.line/fill/order-default.js index 93625a508..4fdfda18c 100644 --- a/test/fixtures/controller.line/fill/order-default.js +++ b/test/fixtures/controller.line/fill/order-default.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: true @@ -33,6 +31,12 @@ module.exports = { scales: { x: {display: false}, y: {display: false} + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.line/fill/order.js b/test/fixtures/controller.line/fill/order.js index 11b2496d3..6a05ac9c0 100644 --- a/test/fixtures/controller.line/fill/order.js +++ b/test/fixtures/controller.line/fill/order.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: true @@ -33,6 +31,12 @@ module.exports = { scales: { x: {display: false}, y: {display: false} + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.line/fill/scriptable.js b/test/fixtures/controller.line/fill/scriptable.js index fce9a888d..c6e82c95b 100644 --- a/test/fixtures/controller.line/fill/scriptable.js +++ b/test/fixtures/controller.line/fill/scriptable.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { backgroundColor: '#00ff00', @@ -35,6 +33,12 @@ module.exports = { scales: { x: {display: false}, y: {display: false} + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.line/fill/value.js b/test/fixtures/controller.line/fill/value.js index 469c6f42d..a10cc5205 100644 --- a/test/fixtures/controller.line/fill/value.js +++ b/test/fixtures/controller.line/fill/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { backgroundColor: '#00ff00', @@ -31,6 +29,12 @@ module.exports = { scales: { x: {display: false}, y: {display: false} + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.line/non-numeric-y.json b/test/fixtures/controller.line/non-numeric-y.json index c12afdc65..e4c011f8d 100644 --- a/test/fixtures/controller.line/non-numeric-y.json +++ b/test/fixtures/controller.line/non-numeric-y.json @@ -14,8 +14,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": {"display": false}, "y": { diff --git a/test/fixtures/controller.line/point-style-offscreen-canvas.json b/test/fixtures/controller.line/point-style-offscreen-canvas.json index dce4f0af6..ebd680712 100644 --- a/test/fixtures/controller.line/point-style-offscreen-canvas.json +++ b/test/fixtures/controller.line/point-style-offscreen-canvas.json @@ -61,8 +61,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": {"display": false}, "y": { diff --git a/test/fixtures/controller.line/point-style.json b/test/fixtures/controller.line/point-style.json index de860cc04..3d008d2f1 100644 --- a/test/fixtures/controller.line/point-style.json +++ b/test/fixtures/controller.line/point-style.json @@ -61,8 +61,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scales": { "x": {"display": false}, "y": { diff --git a/test/fixtures/controller.line/pointBackgroundColor/indexable.js b/test/fixtures/controller.line/pointBackgroundColor/indexable.js index dc8ca784c..a048f3c19 100644 --- a/test/fixtures/controller.line/pointBackgroundColor/indexable.js +++ b/test/fixtures/controller.line/pointBackgroundColor/indexable.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/pointBackgroundColor/scriptable.js b/test/fixtures/controller.line/pointBackgroundColor/scriptable.js index c265d2d4f..ba1200dba 100644 --- a/test/fixtures/controller.line/pointBackgroundColor/scriptable.js +++ b/test/fixtures/controller.line/pointBackgroundColor/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/pointBackgroundColor/value.js b/test/fixtures/controller.line/pointBackgroundColor/value.js index ccf1f22b9..ef5df3378 100644 --- a/test/fixtures/controller.line/pointBackgroundColor/value.js +++ b/test/fixtures/controller.line/pointBackgroundColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/pointBorderColor/indexable.js b/test/fixtures/controller.line/pointBorderColor/indexable.js index e2836f9f4..3f3298682 100644 --- a/test/fixtures/controller.line/pointBorderColor/indexable.js +++ b/test/fixtures/controller.line/pointBorderColor/indexable.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/pointBorderColor/scriptable.js b/test/fixtures/controller.line/pointBorderColor/scriptable.js index 3d0c91744..556be7c64 100644 --- a/test/fixtures/controller.line/pointBorderColor/scriptable.js +++ b/test/fixtures/controller.line/pointBorderColor/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/pointBorderColor/value.js b/test/fixtures/controller.line/pointBorderColor/value.js index f35162fbb..1650b32c8 100644 --- a/test/fixtures/controller.line/pointBorderColor/value.js +++ b/test/fixtures/controller.line/pointBorderColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/pointBorderWidth/indexable.js b/test/fixtures/controller.line/pointBorderWidth/indexable.js index 6baf54ffd..0e819b255 100644 --- a/test/fixtures/controller.line/pointBorderWidth/indexable.js +++ b/test/fixtures/controller.line/pointBorderWidth/indexable.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/pointBorderWidth/scriptable.js b/test/fixtures/controller.line/pointBorderWidth/scriptable.js index 9e9e1f3b1..d833281b4 100644 --- a/test/fixtures/controller.line/pointBorderWidth/scriptable.js +++ b/test/fixtures/controller.line/pointBorderWidth/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/pointBorderWidth/value.js b/test/fixtures/controller.line/pointBorderWidth/value.js index da80f9552..1327fd3a5 100644 --- a/test/fixtures/controller.line/pointBorderWidth/value.js +++ b/test/fixtures/controller.line/pointBorderWidth/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/pointStyle/indexable.js b/test/fixtures/controller.line/pointStyle/indexable.js index 433f0618a..3029f8116 100644 --- a/test/fixtures/controller.line/pointStyle/indexable.js +++ b/test/fixtures/controller.line/pointStyle/indexable.js @@ -25,8 +25,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/pointStyle/scriptable.js b/test/fixtures/controller.line/pointStyle/scriptable.js index 50706e942..bd68344e5 100644 --- a/test/fixtures/controller.line/pointStyle/scriptable.js +++ b/test/fixtures/controller.line/pointStyle/scriptable.js @@ -24,8 +24,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/pointStyle/value.js b/test/fixtures/controller.line/pointStyle/value.js index 1a408bea0..87f78d79d 100644 --- a/test/fixtures/controller.line/pointStyle/value.js +++ b/test/fixtures/controller.line/pointStyle/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/radius/indexable.js b/test/fixtures/controller.line/radius/indexable.js index 605e19ced..2c3ade90c 100644 --- a/test/fixtures/controller.line/radius/indexable.js +++ b/test/fixtures/controller.line/radius/indexable.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/radius/scriptable.js b/test/fixtures/controller.line/radius/scriptable.js index eb32bb8fe..e08e919b0 100644 --- a/test/fixtures/controller.line/radius/scriptable.js +++ b/test/fixtures/controller.line/radius/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/radius/value.js b/test/fixtures/controller.line/radius/value.js index 155b113bc..60a33c69b 100644 --- a/test/fixtures/controller.line/radius/value.js +++ b/test/fixtures/controller.line/radius/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/rotation/indexable.js b/test/fixtures/controller.line/rotation/indexable.js index 4510f3898..d3f33a05d 100644 --- a/test/fixtures/controller.line/rotation/indexable.js +++ b/test/fixtures/controller.line/rotation/indexable.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/rotation/scriptable.js b/test/fixtures/controller.line/rotation/scriptable.js index 0ba7e151d..9cb5199d6 100644 --- a/test/fixtures/controller.line/rotation/scriptable.js +++ b/test/fixtures/controller.line/rotation/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/rotation/value.js b/test/fixtures/controller.line/rotation/value.js index 77b696942..00072267a 100644 --- a/test/fixtures/controller.line/rotation/value.js +++ b/test/fixtures/controller.line/rotation/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.line/showLine/dataset.js b/test/fixtures/controller.line/showLine/dataset.js index fd755ca37..2eee50599 100644 --- a/test/fixtures/controller.line/showLine/dataset.js +++ b/test/fixtures/controller.line/showLine/dataset.js @@ -14,8 +14,6 @@ module.exports = { labels: ['label1', 'label2', 'label3', 'label4'] }, options: { - legend: false, - title: false, showLine: true, scales: { x: { @@ -24,6 +22,12 @@ module.exports = { y: { display: false } + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.line/showLine/false.js b/test/fixtures/controller.line/showLine/false.js index 026c51027..a90097b0c 100644 --- a/test/fixtures/controller.line/showLine/false.js +++ b/test/fixtures/controller.line/showLine/false.js @@ -12,8 +12,6 @@ module.exports = { labels: ['label1', 'label2', 'label3', 'label4'] }, options: { - legend: false, - title: false, showLine: false, scales: { x: { @@ -22,6 +20,12 @@ module.exports = { y: { display: false } + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } } diff --git a/test/fixtures/controller.line/stacking/order-default.js b/test/fixtures/controller.line/stacking/order-default.js index 2e2a56ba8..073afcda5 100644 --- a/test/fixtures/controller.line/stacking/order-default.js +++ b/test/fixtures/controller.line/stacking/order-default.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: true @@ -33,6 +31,12 @@ module.exports = { scales: { x: {stacked: true, display: false}, y: {stacked: true, display: false} + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.line/stacking/order-specified.js b/test/fixtures/controller.line/stacking/order-specified.js index 7c7a2602a..811496e30 100644 --- a/test/fixtures/controller.line/stacking/order-specified.js +++ b/test/fixtures/controller.line/stacking/order-specified.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: true @@ -35,6 +33,12 @@ module.exports = { scales: { x: {stacked: true, display: false}, y: {stacked: true, display: false} + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.line/stacking/stacked-scatter.js b/test/fixtures/controller.line/stacking/stacked-scatter.js index 2047b5f55..a8085b629 100644 --- a/test/fixtures/controller.line/stacking/stacked-scatter.js +++ b/test/fixtures/controller.line/stacking/stacked-scatter.js @@ -46,9 +46,6 @@ module.exports = { }], }, options: { - legend: { - display: false, - }, scales: { x: { display: false, @@ -60,6 +57,12 @@ module.exports = { position: 'left', }, }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true + } }, }, options: { diff --git a/test/fixtures/controller.polarArea/angle-array.json b/test/fixtures/controller.polarArea/angle-array.json index 073e5708c..151b04b33 100644 --- a/test/fixtures/controller.polarArea/angle-array.json +++ b/test/fixtures/controller.polarArea/angle-array.json @@ -24,8 +24,6 @@ } }, "responsive": false, - "legend": false, - "title": false, "scale": { "display": false } diff --git a/test/fixtures/controller.polarArea/angle-lines.json b/test/fixtures/controller.polarArea/angle-lines.json index 01474c028..b7c05d549 100644 --- a/test/fixtures/controller.polarArea/angle-lines.json +++ b/test/fixtures/controller.polarArea/angle-lines.json @@ -18,8 +18,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scale": { "display": true, "angleLines": { diff --git a/test/fixtures/controller.polarArea/angle-undefined.json b/test/fixtures/controller.polarArea/angle-undefined.json index ef83f1b87..e1758b4b7 100644 --- a/test/fixtures/controller.polarArea/angle-undefined.json +++ b/test/fixtures/controller.polarArea/angle-undefined.json @@ -17,8 +17,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scale": { "display": false } diff --git a/test/fixtures/controller.polarArea/backgroundColor/indexable-dataset.js b/test/fixtures/controller.polarArea/backgroundColor/indexable-dataset.js index f1dde3224..60e635cdd 100644 --- a/test/fixtures/controller.polarArea/backgroundColor/indexable-dataset.js +++ b/test/fixtures/controller.polarArea/backgroundColor/indexable-dataset.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scale: { display: false } diff --git a/test/fixtures/controller.polarArea/backgroundColor/indexable-element-options.js b/test/fixtures/controller.polarArea/backgroundColor/indexable-element-options.js index c3f26b6f3..371f2b606 100644 --- a/test/fixtures/controller.polarArea/backgroundColor/indexable-element-options.js +++ b/test/fixtures/controller.polarArea/backgroundColor/indexable-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: [ diff --git a/test/fixtures/controller.polarArea/backgroundColor/scriptable-dataset.js b/test/fixtures/controller.polarArea/backgroundColor/scriptable-dataset.js index d850b4d2e..22f2b0e80 100644 --- a/test/fixtures/controller.polarArea/backgroundColor/scriptable-dataset.js +++ b/test/fixtures/controller.polarArea/backgroundColor/scriptable-dataset.js @@ -18,8 +18,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scale: { display: false } diff --git a/test/fixtures/controller.polarArea/backgroundColor/scriptable-element-options.js b/test/fixtures/controller.polarArea/backgroundColor/scriptable-element-options.js index 4dd4d0c42..97fb91317 100644 --- a/test/fixtures/controller.polarArea/backgroundColor/scriptable-element-options.js +++ b/test/fixtures/controller.polarArea/backgroundColor/scriptable-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: function(ctx) { diff --git a/test/fixtures/controller.polarArea/backgroundColor/value-dataset.js b/test/fixtures/controller.polarArea/backgroundColor/value-dataset.js index 502e8358a..7a17ee754 100644 --- a/test/fixtures/controller.polarArea/backgroundColor/value-dataset.js +++ b/test/fixtures/controller.polarArea/backgroundColor/value-dataset.js @@ -12,8 +12,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scale: { display: false } diff --git a/test/fixtures/controller.polarArea/backgroundColor/value-element-options.js b/test/fixtures/controller.polarArea/backgroundColor/value-element-options.js index e3448be14..8c0dc9423 100644 --- a/test/fixtures/controller.polarArea/backgroundColor/value-element-options.js +++ b/test/fixtures/controller.polarArea/backgroundColor/value-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: '#00ff00' diff --git a/test/fixtures/controller.polarArea/border-align-center.json b/test/fixtures/controller.polarArea/border-align-center.json index 45b49f3db..683cc9fb0 100644 --- a/test/fixtures/controller.polarArea/border-align-center.json +++ b/test/fixtures/controller.polarArea/border-align-center.json @@ -31,8 +31,6 @@ } }, "responsive": false, - "legend": false, - "title": false, "scale": { "display": false } diff --git a/test/fixtures/controller.polarArea/border-align-inner.json b/test/fixtures/controller.polarArea/border-align-inner.json index c6edc39d3..6ed5753aa 100644 --- a/test/fixtures/controller.polarArea/border-align-inner.json +++ b/test/fixtures/controller.polarArea/border-align-inner.json @@ -32,8 +32,6 @@ } }, "responsive": false, - "legend": false, - "title": false, "scale": { "display": false } diff --git a/test/fixtures/controller.polarArea/borderAlign/indexable-dataset.js b/test/fixtures/controller.polarArea/borderAlign/indexable-dataset.js index b6aaee0eb..67a8005ea 100644 --- a/test/fixtures/controller.polarArea/borderAlign/indexable-dataset.js +++ b/test/fixtures/controller.polarArea/borderAlign/indexable-dataset.js @@ -20,8 +20,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderAlign/indexable-element-options.js b/test/fixtures/controller.polarArea/borderAlign/indexable-element-options.js index eea0a0e5a..77f417d23 100644 --- a/test/fixtures/controller.polarArea/borderAlign/indexable-element-options.js +++ b/test/fixtures/controller.polarArea/borderAlign/indexable-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderAlign/scriptable-dataset.js b/test/fixtures/controller.polarArea/borderAlign/scriptable-dataset.js index 0ba4263f0..b84e3eed9 100644 --- a/test/fixtures/controller.polarArea/borderAlign/scriptable-dataset.js +++ b/test/fixtures/controller.polarArea/borderAlign/scriptable-dataset.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderAlign/scriptable-element-options.js b/test/fixtures/controller.polarArea/borderAlign/scriptable-element-options.js index 45e93a1c2..0008cd954 100644 --- a/test/fixtures/controller.polarArea/borderAlign/scriptable-element-options.js +++ b/test/fixtures/controller.polarArea/borderAlign/scriptable-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderAlign/value-dataset.js b/test/fixtures/controller.polarArea/borderAlign/value-dataset.js index 6ad1a5113..6c2c5de4b 100644 --- a/test/fixtures/controller.polarArea/borderAlign/value-dataset.js +++ b/test/fixtures/controller.polarArea/borderAlign/value-dataset.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderAlign/value-element-options.js b/test/fixtures/controller.polarArea/borderAlign/value-element-options.js index e70dc6908..29beb1027 100644 --- a/test/fixtures/controller.polarArea/borderAlign/value-element-options.js +++ b/test/fixtures/controller.polarArea/borderAlign/value-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderColor/indexable-dataset.js b/test/fixtures/controller.polarArea/borderColor/indexable-dataset.js index 660941ef0..655afa8d0 100644 --- a/test/fixtures/controller.polarArea/borderColor/indexable-dataset.js +++ b/test/fixtures/controller.polarArea/borderColor/indexable-dataset.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderColor/indexable-element-options.js b/test/fixtures/controller.polarArea/borderColor/indexable-element-options.js index 818986697..982a72d29 100644 --- a/test/fixtures/controller.polarArea/borderColor/indexable-element-options.js +++ b/test/fixtures/controller.polarArea/borderColor/indexable-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderColor/scriptable-dataset.js b/test/fixtures/controller.polarArea/borderColor/scriptable-dataset.js index 6f837a740..4af1e488b 100644 --- a/test/fixtures/controller.polarArea/borderColor/scriptable-dataset.js +++ b/test/fixtures/controller.polarArea/borderColor/scriptable-dataset.js @@ -18,8 +18,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderColor/scriptable-element-options.js b/test/fixtures/controller.polarArea/borderColor/scriptable-element-options.js index 93f8b53ff..58f14739c 100644 --- a/test/fixtures/controller.polarArea/borderColor/scriptable-element-options.js +++ b/test/fixtures/controller.polarArea/borderColor/scriptable-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderColor/value-dataset.js b/test/fixtures/controller.polarArea/borderColor/value-dataset.js index 0361c730b..d266635e3 100644 --- a/test/fixtures/controller.polarArea/borderColor/value-dataset.js +++ b/test/fixtures/controller.polarArea/borderColor/value-dataset.js @@ -12,8 +12,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderColor/value-element-options.js b/test/fixtures/controller.polarArea/borderColor/value-element-options.js index cff65f4ea..45e8693f4 100644 --- a/test/fixtures/controller.polarArea/borderColor/value-element-options.js +++ b/test/fixtures/controller.polarArea/borderColor/value-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderWidth/indexable-dataset.js b/test/fixtures/controller.polarArea/borderWidth/indexable-dataset.js index 730de30e0..c03f64c24 100644 --- a/test/fixtures/controller.polarArea/borderWidth/indexable-dataset.js +++ b/test/fixtures/controller.polarArea/borderWidth/indexable-dataset.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderWidth/indexable-element-options.js b/test/fixtures/controller.polarArea/borderWidth/indexable-element-options.js index cc790efb1..2b7d14412 100644 --- a/test/fixtures/controller.polarArea/borderWidth/indexable-element-options.js +++ b/test/fixtures/controller.polarArea/borderWidth/indexable-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderWidth/scriptable-dataset.js b/test/fixtures/controller.polarArea/borderWidth/scriptable-dataset.js index c145811e1..36e91a7fd 100644 --- a/test/fixtures/controller.polarArea/borderWidth/scriptable-dataset.js +++ b/test/fixtures/controller.polarArea/borderWidth/scriptable-dataset.js @@ -15,8 +15,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderWidth/scriptable-element-options.js b/test/fixtures/controller.polarArea/borderWidth/scriptable-element-options.js index f0dae0725..dca17e685 100644 --- a/test/fixtures/controller.polarArea/borderWidth/scriptable-element-options.js +++ b/test/fixtures/controller.polarArea/borderWidth/scriptable-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderWidth/value-dataset.js b/test/fixtures/controller.polarArea/borderWidth/value-dataset.js index 1c7691cb8..2fc8e1b25 100644 --- a/test/fixtures/controller.polarArea/borderWidth/value-dataset.js +++ b/test/fixtures/controller.polarArea/borderWidth/value-dataset.js @@ -12,8 +12,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.polarArea/borderWidth/value-element-options.js b/test/fixtures/controller.polarArea/borderWidth/value-element-options.js index 02d9339e0..bdafaca68 100644 --- a/test/fixtures/controller.polarArea/borderWidth/value-element-options.js +++ b/test/fixtures/controller.polarArea/borderWidth/value-element-options.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { arc: { backgroundColor: 'transparent', diff --git a/test/fixtures/controller.radar/backgroundColor/scriptable.js b/test/fixtures/controller.radar/backgroundColor/scriptable.js index 2ff729099..80953d7b9 100644 --- a/test/fixtures/controller.radar/backgroundColor/scriptable.js +++ b/test/fixtures/controller.radar/backgroundColor/scriptable.js @@ -21,8 +21,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { backgroundColor: function(ctx) { @@ -40,7 +38,13 @@ module.exports = { }, scale: { display: false, - min: -15 + min: -15, + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.radar/backgroundColor/value.js b/test/fixtures/controller.radar/backgroundColor/value.js index 1c8651edb..5c090a775 100644 --- a/test/fixtures/controller.radar/backgroundColor/value.js +++ b/test/fixtures/controller.radar/backgroundColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { backgroundColor: '#00ff00', @@ -30,6 +28,12 @@ module.exports = { scale: { display: false, min: -15 + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.radar/borderCapStyle/scriptable.js b/test/fixtures/controller.radar/borderCapStyle/scriptable.js index f0db0da67..bbcf06dae 100644 --- a/test/fixtures/controller.radar/borderCapStyle/scriptable.js +++ b/test/fixtures/controller.radar/borderCapStyle/scriptable.js @@ -25,8 +25,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderCapStyle: function(ctx) { diff --git a/test/fixtures/controller.radar/borderCapStyle/value.js b/test/fixtures/controller.radar/borderCapStyle/value.js index 6de72cba8..c730dfc86 100644 --- a/test/fixtures/controller.radar/borderCapStyle/value.js +++ b/test/fixtures/controller.radar/borderCapStyle/value.js @@ -21,8 +21,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderCapStyle: 'butt', diff --git a/test/fixtures/controller.radar/borderColor/scriptable.js b/test/fixtures/controller.radar/borderColor/scriptable.js index 2767e9786..89bdf26ee 100644 --- a/test/fixtures/controller.radar/borderColor/scriptable.js +++ b/test/fixtures/controller.radar/borderColor/scriptable.js @@ -21,8 +21,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: function(ctx) { diff --git a/test/fixtures/controller.radar/borderColor/value.js b/test/fixtures/controller.radar/borderColor/value.js index e0e677f26..9b9bacfc0 100644 --- a/test/fixtures/controller.radar/borderColor/value.js +++ b/test/fixtures/controller.radar/borderColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#0000ff', diff --git a/test/fixtures/controller.radar/borderDash/scriptable.js b/test/fixtures/controller.radar/borderDash/scriptable.js index 8415eff43..8a54bfb92 100644 --- a/test/fixtures/controller.radar/borderDash/scriptable.js +++ b/test/fixtures/controller.radar/borderDash/scriptable.js @@ -18,8 +18,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.radar/borderDash/value.js b/test/fixtures/controller.radar/borderDash/value.js index 92439aab8..f4a4596df 100644 --- a/test/fixtures/controller.radar/borderDash/value.js +++ b/test/fixtures/controller.radar/borderDash/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.radar/borderDashOffset/scriptable.js b/test/fixtures/controller.radar/borderDashOffset/scriptable.js index 9f8a6e879..5262483fc 100644 --- a/test/fixtures/controller.radar/borderDashOffset/scriptable.js +++ b/test/fixtures/controller.radar/borderDashOffset/scriptable.js @@ -20,8 +20,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.radar/borderDashOffset/value.js b/test/fixtures/controller.radar/borderDashOffset/value.js index c26805e14..6c7ed68f2 100644 --- a/test/fixtures/controller.radar/borderDashOffset/value.js +++ b/test/fixtures/controller.radar/borderDashOffset/value.js @@ -18,8 +18,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.radar/borderJoinStyle/scriptable.js b/test/fixtures/controller.radar/borderJoinStyle/scriptable.js index 435af7230..5ff3fdd01 100644 --- a/test/fixtures/controller.radar/borderJoinStyle/scriptable.js +++ b/test/fixtures/controller.radar/borderJoinStyle/scriptable.js @@ -27,8 +27,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.radar/borderJoinStyle/value.js b/test/fixtures/controller.radar/borderJoinStyle/value.js index 580ef743e..ad6a00033 100644 --- a/test/fixtures/controller.radar/borderJoinStyle/value.js +++ b/test/fixtures/controller.radar/borderJoinStyle/value.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.radar/borderWidth/scriptable.js b/test/fixtures/controller.radar/borderWidth/scriptable.js index 64fcffad9..99ec83bd4 100644 --- a/test/fixtures/controller.radar/borderWidth/scriptable.js +++ b/test/fixtures/controller.radar/borderWidth/scriptable.js @@ -21,8 +21,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#ff0000', diff --git a/test/fixtures/controller.radar/borderWidth/value.js b/test/fixtures/controller.radar/borderWidth/value.js index 29c7e5780..3292c0b04 100644 --- a/test/fixtures/controller.radar/borderWidth/value.js +++ b/test/fixtures/controller.radar/borderWidth/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.radar/borderWidth/zero.js b/test/fixtures/controller.radar/borderWidth/zero.js index dd1bb6555..1298b0ab1 100644 --- a/test/fixtures/controller.radar/borderWidth/zero.js +++ b/test/fixtures/controller.radar/borderWidth/zero.js @@ -18,8 +18,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { borderColor: '#00ff00', diff --git a/test/fixtures/controller.radar/fill/scriptable.js b/test/fixtures/controller.radar/fill/scriptable.js index b57599c07..aef77d0da 100644 --- a/test/fixtures/controller.radar/fill/scriptable.js +++ b/test/fixtures/controller.radar/fill/scriptable.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { backgroundColor: '#00ff00', @@ -32,6 +30,12 @@ module.exports = { scale: { display: false, min: -15 + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.radar/fill/value.js b/test/fixtures/controller.radar/fill/value.js index f2c21f645..6e31a41c2 100644 --- a/test/fixtures/controller.radar/fill/value.js +++ b/test/fixtures/controller.radar/fill/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { backgroundColor: '#00ff00', @@ -28,6 +26,12 @@ module.exports = { scale: { display: false, min: -15 + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.radar/point-style.json b/test/fixtures/controller.radar/point-style.json index 8fea82502..cf119b046 100644 --- a/test/fixtures/controller.radar/point-style.json +++ b/test/fixtures/controller.radar/point-style.json @@ -64,8 +64,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scale": { "display": false, "min": 0, diff --git a/test/fixtures/controller.radar/pointBackgroundColor/indexable.js b/test/fixtures/controller.radar/pointBackgroundColor/indexable.js index d3f44572c..4f1ec3801 100644 --- a/test/fixtures/controller.radar/pointBackgroundColor/indexable.js +++ b/test/fixtures/controller.radar/pointBackgroundColor/indexable.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false diff --git a/test/fixtures/controller.radar/pointBackgroundColor/scriptable.js b/test/fixtures/controller.radar/pointBackgroundColor/scriptable.js index edc160eff..41009805d 100644 --- a/test/fixtures/controller.radar/pointBackgroundColor/scriptable.js +++ b/test/fixtures/controller.radar/pointBackgroundColor/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false diff --git a/test/fixtures/controller.radar/pointBackgroundColor/value.js b/test/fixtures/controller.radar/pointBackgroundColor/value.js index 4688dc32a..469e5ec1e 100644 --- a/test/fixtures/controller.radar/pointBackgroundColor/value.js +++ b/test/fixtures/controller.radar/pointBackgroundColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false diff --git a/test/fixtures/controller.radar/pointBorderColor/indexable.js b/test/fixtures/controller.radar/pointBorderColor/indexable.js index 45fb8e275..90fa772e4 100644 --- a/test/fixtures/controller.radar/pointBorderColor/indexable.js +++ b/test/fixtures/controller.radar/pointBorderColor/indexable.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false diff --git a/test/fixtures/controller.radar/pointBorderColor/scriptable.js b/test/fixtures/controller.radar/pointBorderColor/scriptable.js index 4e343c50a..da65f1e19 100644 --- a/test/fixtures/controller.radar/pointBorderColor/scriptable.js +++ b/test/fixtures/controller.radar/pointBorderColor/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false diff --git a/test/fixtures/controller.radar/pointBorderColor/value.js b/test/fixtures/controller.radar/pointBorderColor/value.js index 3e80106d0..d46c2b875 100644 --- a/test/fixtures/controller.radar/pointBorderColor/value.js +++ b/test/fixtures/controller.radar/pointBorderColor/value.js @@ -16,8 +16,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false diff --git a/test/fixtures/controller.radar/pointBorderWidth/indexable.js b/test/fixtures/controller.radar/pointBorderWidth/indexable.js index 2c6b6b5ce..6f4b1e92c 100644 --- a/test/fixtures/controller.radar/pointBorderWidth/indexable.js +++ b/test/fixtures/controller.radar/pointBorderWidth/indexable.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false diff --git a/test/fixtures/controller.radar/pointBorderWidth/scriptable.js b/test/fixtures/controller.radar/pointBorderWidth/scriptable.js index 51e77e4a7..2c3b65ed5 100644 --- a/test/fixtures/controller.radar/pointBorderWidth/scriptable.js +++ b/test/fixtures/controller.radar/pointBorderWidth/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false diff --git a/test/fixtures/controller.radar/pointBorderWidth/value.js b/test/fixtures/controller.radar/pointBorderWidth/value.js index 74bd41700..9c881bbca 100644 --- a/test/fixtures/controller.radar/pointBorderWidth/value.js +++ b/test/fixtures/controller.radar/pointBorderWidth/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false diff --git a/test/fixtures/controller.radar/pointStyle/indexable.js b/test/fixtures/controller.radar/pointStyle/indexable.js index 55b52a601..8724a3648 100644 --- a/test/fixtures/controller.radar/pointStyle/indexable.js +++ b/test/fixtures/controller.radar/pointStyle/indexable.js @@ -25,8 +25,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.radar/pointStyle/scriptable.js b/test/fixtures/controller.radar/pointStyle/scriptable.js index dbf2e9a26..3f3210b6b 100644 --- a/test/fixtures/controller.radar/pointStyle/scriptable.js +++ b/test/fixtures/controller.radar/pointStyle/scriptable.js @@ -24,8 +24,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.radar/pointStyle/value.js b/test/fixtures/controller.radar/pointStyle/value.js index beab6ed68..08596a870 100644 --- a/test/fixtures/controller.radar/pointStyle/value.js +++ b/test/fixtures/controller.radar/pointStyle/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.radar/radius/indexable.js b/test/fixtures/controller.radar/radius/indexable.js index b052d88b6..7b836149a 100644 --- a/test/fixtures/controller.radar/radius/indexable.js +++ b/test/fixtures/controller.radar/radius/indexable.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.radar/radius/scriptable.js b/test/fixtures/controller.radar/radius/scriptable.js index 69ca5777d..dcac83526 100644 --- a/test/fixtures/controller.radar/radius/scriptable.js +++ b/test/fixtures/controller.radar/radius/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.radar/radius/value.js b/test/fixtures/controller.radar/radius/value.js index 42a0cf00d..bf32433e8 100644 --- a/test/fixtures/controller.radar/radius/value.js +++ b/test/fixtures/controller.radar/radius/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.radar/rotation/indexable.js b/test/fixtures/controller.radar/rotation/indexable.js index 5b4f69dfc..6ab5d83ee 100644 --- a/test/fixtures/controller.radar/rotation/indexable.js +++ b/test/fixtures/controller.radar/rotation/indexable.js @@ -19,8 +19,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.radar/rotation/scriptable.js b/test/fixtures/controller.radar/rotation/scriptable.js index 6a5d7f33f..134673be1 100644 --- a/test/fixtures/controller.radar/rotation/scriptable.js +++ b/test/fixtures/controller.radar/rotation/scriptable.js @@ -22,8 +22,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.radar/rotation/value.js b/test/fixtures/controller.radar/rotation/value.js index b842151c8..c9a46ad43 100644 --- a/test/fixtures/controller.radar/rotation/value.js +++ b/test/fixtures/controller.radar/rotation/value.js @@ -17,8 +17,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, elements: { line: { fill: false, diff --git a/test/fixtures/controller.radar/showLine/value.js b/test/fixtures/controller.radar/showLine/value.js index f903c38f8..3973195f0 100644 --- a/test/fixtures/controller.radar/showLine/value.js +++ b/test/fixtures/controller.radar/showLine/value.js @@ -23,8 +23,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, showLine: false, elements: { line: { @@ -36,6 +34,12 @@ module.exports = { scale: { display: false, min: -15 + }, + plugins: { + legend: false, + title: false, + tooltip: false, + filler: true } } }, diff --git a/test/fixtures/controller.scatter/showLine/true.js b/test/fixtures/controller.scatter/showLine/true.js index 9c31f48de..7c8732acf 100644 --- a/test/fixtures/controller.scatter/showLine/true.js +++ b/test/fixtures/controller.scatter/showLine/true.js @@ -12,8 +12,6 @@ module.exports = { }], }, options: { - legend: false, - title: false, scales: { x: { display: false diff --git a/test/fixtures/controller.scatter/showLine/undefined.js b/test/fixtures/controller.scatter/showLine/undefined.js index 4da3e5854..de4cf7fe3 100644 --- a/test/fixtures/controller.scatter/showLine/undefined.js +++ b/test/fixtures/controller.scatter/showLine/undefined.js @@ -11,8 +11,6 @@ module.exports = { }], }, options: { - legend: false, - title: false, scales: { x: { display: false diff --git a/test/fixtures/core.scale/cartesian-axis-border-settings.json b/test/fixtures/core.scale/cartesian-axis-border-settings.json index 47196ae15..3bcd930e8 100644 --- a/test/fixtures/core.scale/cartesian-axis-border-settings.json +++ b/test/fixtures/core.scale/cartesian-axis-border-settings.json @@ -16,8 +16,6 @@ }] }, "options": { - "legend": false, - "title": false, "scales": { "x": { "axis": "x", diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-bottom-center.js b/test/fixtures/core.scale/crossAlignment/cross-align-bottom-center.js index 46121d273..e98994242 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-bottom-center.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-bottom-center.js @@ -8,8 +8,6 @@ module.exports = { labels: [['Label1', 'line 2', 'line3'], 'Label2', 'Label3'] }, options: { - legend: false, - title: false, scales: { x: { ticks: { diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-bottom-far.js b/test/fixtures/core.scale/crossAlignment/cross-align-bottom-far.js index aa305d0ce..d5cfee5b7 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-bottom-far.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-bottom-far.js @@ -8,8 +8,6 @@ module.exports = { labels: [['Label1', 'line 2', 'line3'], 'Label2', 'Label3'] }, options: { - legend: false, - title: false, scales: { x: { ticks: { diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-bottom-near.js b/test/fixtures/core.scale/crossAlignment/cross-align-bottom-near.js index 210831529..659aa2c6a 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-bottom-near.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-bottom-near.js @@ -8,8 +8,6 @@ module.exports = { labels: [['Label1', 'line 2', 'line3'], 'Label2', 'Label3'] }, options: { - legend: false, - title: false, scales: { x: { ticks: { diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-left-center.js b/test/fixtures/core.scale/crossAlignment/cross-align-left-center.js index 59aa67d18..a2964b44f 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-left-center.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-left-center.js @@ -9,8 +9,6 @@ module.exports = { }, options: { indexAxis: 'y', - legend: false, - title: false, scales: { y: { position: 'left', diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-left-far.js b/test/fixtures/core.scale/crossAlignment/cross-align-left-far.js index de119d18c..a2cdb723b 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-left-far.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-left-far.js @@ -9,8 +9,6 @@ module.exports = { }, options: { indexAxis: 'y', - legend: false, - title: false, scales: { y: { position: 'left', diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-left-near.js b/test/fixtures/core.scale/crossAlignment/cross-align-left-near.js index 6531612e1..69ea769d4 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-left-near.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-left-near.js @@ -9,8 +9,6 @@ module.exports = { }, options: { indexAxis: 'y', - legend: false, - title: false, scales: { y: { position: 'left', diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-right-center.js b/test/fixtures/core.scale/crossAlignment/cross-align-right-center.js index 10a41b228..ab31fd4a4 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-right-center.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-right-center.js @@ -9,8 +9,6 @@ module.exports = { }, options: { indexAxis: 'y', - legend: false, - title: false, scales: { y: { position: 'right', diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-right-far.js b/test/fixtures/core.scale/crossAlignment/cross-align-right-far.js index adbdb32d2..dc2d1a16d 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-right-far.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-right-far.js @@ -9,8 +9,6 @@ module.exports = { }, options: { indexAxis: 'y', - legend: false, - title: false, scales: { y: { position: 'right', diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-right-near.js b/test/fixtures/core.scale/crossAlignment/cross-align-right-near.js index cd8e94e35..7bcba8f86 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-right-near.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-right-near.js @@ -9,8 +9,6 @@ module.exports = { }, options: { indexAxis: 'y', - legend: false, - title: false, scales: { y: { position: 'right', diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-top-center.js b/test/fixtures/core.scale/crossAlignment/cross-align-top-center.js index 31386b773..9096a4f37 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-top-center.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-top-center.js @@ -8,8 +8,6 @@ module.exports = { labels: [['Label1', 'line 2', 'line3'], 'Label2', 'Label3'] }, options: { - legend: false, - title: false, scales: { x: { position: 'top', diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-top-far.js b/test/fixtures/core.scale/crossAlignment/cross-align-top-far.js index c4606b715..e4d16b977 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-top-far.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-top-far.js @@ -8,8 +8,6 @@ module.exports = { labels: [['Label1', 'line 2', 'line3'], 'Label2', 'Label3'] }, options: { - legend: false, - title: false, scales: { x: { position: 'top', diff --git a/test/fixtures/core.scale/crossAlignment/cross-align-top-near.js b/test/fixtures/core.scale/crossAlignment/cross-align-top-near.js index c89e3c01a..707b3cc49 100644 --- a/test/fixtures/core.scale/crossAlignment/cross-align-top-near.js +++ b/test/fixtures/core.scale/crossAlignment/cross-align-top-near.js @@ -8,8 +8,6 @@ module.exports = { labels: [['Label1', 'line 2', 'line3'], 'Label2', 'Label3'] }, options: { - legend: false, - title: false, scales: { x: { position: 'top', diff --git a/test/fixtures/core.scale/label-align-center.js b/test/fixtures/core.scale/label-align-center.js index d0a5a04de..1093cecd0 100644 --- a/test/fixtures/core.scale/label-align-center.js +++ b/test/fixtures/core.scale/label-align-center.js @@ -8,8 +8,6 @@ module.exports = { labels: ['Label1', 'Label2', 'Label3'] }, options: { - legend: false, - title: false, scales: { x: { ticks: { diff --git a/test/fixtures/core.scale/label-align-end.js b/test/fixtures/core.scale/label-align-end.js index d7b19fe13..b2b5bdf4e 100644 --- a/test/fixtures/core.scale/label-align-end.js +++ b/test/fixtures/core.scale/label-align-end.js @@ -8,8 +8,6 @@ module.exports = { labels: ['Label1', 'Label2', 'Label3'] }, options: { - legend: false, - title: false, scales: { x: { ticks: { diff --git a/test/fixtures/core.scale/label-align-start.js b/test/fixtures/core.scale/label-align-start.js index 3edcb6500..f8d96d36e 100644 --- a/test/fixtures/core.scale/label-align-start.js +++ b/test/fixtures/core.scale/label-align-start.js @@ -8,8 +8,6 @@ module.exports = { labels: ['Label1', 'Label2', 'Label3'] }, options: { - legend: false, - title: false, scales: { x: { ticks: { diff --git a/test/fixtures/core.scale/label-offset-vertical-axes.json b/test/fixtures/core.scale/label-offset-vertical-axes.json index 0cf9164df..e16d43430 100644 --- a/test/fixtures/core.scale/label-offset-vertical-axes.json +++ b/test/fixtures/core.scale/label-offset-vertical-axes.json @@ -8,8 +8,6 @@ }] }, "options": { - "legend": false, - "title": false, "indexAxis": "y", "scales": { "x": { diff --git a/test/fixtures/core.scale/tick-drawing.json b/test/fixtures/core.scale/tick-drawing.json index c961e659c..12249616b 100644 --- a/test/fixtures/core.scale/tick-drawing.json +++ b/test/fixtures/core.scale/tick-drawing.json @@ -6,8 +6,6 @@ "datasets": [] }, "options": { - "legend": false, - "title": false, "indexAxis": "y", "scales": { "x": { diff --git a/test/fixtures/core.scale/x-axis-position-center.json b/test/fixtures/core.scale/x-axis-position-center.json index 94583f9e3..cb15026bc 100644 --- a/test/fixtures/core.scale/x-axis-position-center.json +++ b/test/fixtures/core.scale/x-axis-position-center.json @@ -16,8 +16,6 @@ }] }, "options": { - "legend": false, - "title": false, "scales": { "x": { "position": "center", diff --git a/test/fixtures/core.scale/x-axis-position-dynamic.json b/test/fixtures/core.scale/x-axis-position-dynamic.json index 84e80670c..53954acd3 100644 --- a/test/fixtures/core.scale/x-axis-position-dynamic.json +++ b/test/fixtures/core.scale/x-axis-position-dynamic.json @@ -16,8 +16,6 @@ }] }, "options": { - "legend": false, - "title": false, "scales": { "x": { "position": { diff --git a/test/fixtures/core.scale/y-axis-position-center.json b/test/fixtures/core.scale/y-axis-position-center.json index 76cc0db3e..1ba27c87c 100644 --- a/test/fixtures/core.scale/y-axis-position-center.json +++ b/test/fixtures/core.scale/y-axis-position-center.json @@ -16,8 +16,6 @@ }] }, "options": { - "legend": false, - "title": false, "scales": { "x": { "position": "bottom", diff --git a/test/fixtures/core.scale/y-axis-position-dynamic.json b/test/fixtures/core.scale/y-axis-position-dynamic.json index c0f9bc304..0eaeb8199 100644 --- a/test/fixtures/core.scale/y-axis-position-dynamic.json +++ b/test/fixtures/core.scale/y-axis-position-dynamic.json @@ -16,8 +16,6 @@ }] }, "options": { - "legend": false, - "title": false, "scales": { "x": { "position": "bottom", diff --git a/test/fixtures/element.line/default.js b/test/fixtures/element.line/default.js index 46628224e..1b55944ec 100644 --- a/test/fixtures/element.line/default.js +++ b/test/fixtures/element.line/default.js @@ -9,8 +9,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/skip/all.js b/test/fixtures/element.line/skip/all.js index 89cbe98e7..80df30a6b 100644 --- a/test/fixtures/element.line/skip/all.js +++ b/test/fixtures/element.line/skip/all.js @@ -12,8 +12,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/skip/first-span.js b/test/fixtures/element.line/skip/first-span.js index f2afa7f45..7bd53d3ee 100644 --- a/test/fixtures/element.line/skip/first-span.js +++ b/test/fixtures/element.line/skip/first-span.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/skip/first.js b/test/fixtures/element.line/skip/first.js index bdab6c83d..2f3b8a8cc 100644 --- a/test/fixtures/element.line/skip/first.js +++ b/test/fixtures/element.line/skip/first.js @@ -12,8 +12,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/skip/last-span.js b/test/fixtures/element.line/skip/last-span.js index d05226a30..147d8252c 100644 --- a/test/fixtures/element.line/skip/last-span.js +++ b/test/fixtures/element.line/skip/last-span.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/skip/last.js b/test/fixtures/element.line/skip/last.js index 5afe55fc1..6f991a45c 100644 --- a/test/fixtures/element.line/skip/last.js +++ b/test/fixtures/element.line/skip/last.js @@ -12,8 +12,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/skip/middle-span.js b/test/fixtures/element.line/skip/middle-span.js index 990731370..94bb63716 100644 --- a/test/fixtures/element.line/skip/middle-span.js +++ b/test/fixtures/element.line/skip/middle-span.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/skip/middle.js b/test/fixtures/element.line/skip/middle.js index 9128fbb9d..6773e75b5 100644 --- a/test/fixtures/element.line/skip/middle.js +++ b/test/fixtures/element.line/skip/middle.js @@ -12,8 +12,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/stepped/after.js b/test/fixtures/element.line/stepped/after.js index 434623748..b9c295560 100644 --- a/test/fixtures/element.line/stepped/after.js +++ b/test/fixtures/element.line/stepped/after.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/stepped/before.js b/test/fixtures/element.line/stepped/before.js index 1d483b9b2..ee4fb6f6e 100644 --- a/test/fixtures/element.line/stepped/before.js +++ b/test/fixtures/element.line/stepped/before.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/stepped/default.js b/test/fixtures/element.line/stepped/default.js index f907158fd..18943ebfc 100644 --- a/test/fixtures/element.line/stepped/default.js +++ b/test/fixtures/element.line/stepped/default.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/stepped/middle.js b/test/fixtures/element.line/stepped/middle.js index 58ad4edf8..69ec1d017 100644 --- a/test/fixtures/element.line/stepped/middle.js +++ b/test/fixtures/element.line/stepped/middle.js @@ -13,8 +13,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/tension/default.js b/test/fixtures/element.line/tension/default.js index d42e3ccd5..d858aa380 100644 --- a/test/fixtures/element.line/tension/default.js +++ b/test/fixtures/element.line/tension/default.js @@ -11,8 +11,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/tension/one.js b/test/fixtures/element.line/tension/one.js index 0631023a7..83306599f 100644 --- a/test/fixtures/element.line/tension/one.js +++ b/test/fixtures/element.line/tension/one.js @@ -12,8 +12,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.line/tension/zero.js b/test/fixtures/element.line/tension/zero.js index 7e738a739..f13a86c62 100644 --- a/test/fixtures/element.line/tension/zero.js +++ b/test/fixtures/element.line/tension/zero.js @@ -12,8 +12,6 @@ module.exports = { ] }, options: { - legend: false, - title: false, scales: { x: {type: 'linear', display: false, min: 0, max: 20}, y: {display: false, min: -15, max: 15} diff --git a/test/fixtures/element.point/point-style-circle.json b/test/fixtures/element.point/point-style-circle.json index ba84c4c7b..b50e11466 100644 --- a/test/fixtures/element.point/point-style-circle.json +++ b/test/fixtures/element.point/point-style-circle.json @@ -42,8 +42,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "elements": { "point": { "pointStyle": "circle" diff --git a/test/fixtures/element.point/point-style-cross-rot.json b/test/fixtures/element.point/point-style-cross-rot.json index c5add4a30..f849a9773 100644 --- a/test/fixtures/element.point/point-style-cross-rot.json +++ b/test/fixtures/element.point/point-style-cross-rot.json @@ -42,8 +42,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "elements": { "point": { "pointStyle": "crossRot" diff --git a/test/fixtures/element.point/point-style-cross.json b/test/fixtures/element.point/point-style-cross.json index 5cce6483f..22686dd90 100644 --- a/test/fixtures/element.point/point-style-cross.json +++ b/test/fixtures/element.point/point-style-cross.json @@ -42,8 +42,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "elements": { "point": { "pointStyle": "cross" diff --git a/test/fixtures/element.point/point-style-dash.json b/test/fixtures/element.point/point-style-dash.json index 0b08ef592..f0ba523fb 100644 --- a/test/fixtures/element.point/point-style-dash.json +++ b/test/fixtures/element.point/point-style-dash.json @@ -42,8 +42,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "elements": { "point": { "pointStyle": "dash" diff --git a/test/fixtures/element.point/point-style-image.js b/test/fixtures/element.point/point-style-image.js index 6ac2f1f8a..6ac7a2a3d 100644 --- a/test/fixtures/element.point/point-style-image.js +++ b/test/fixtures/element.point/point-style-image.js @@ -32,8 +32,6 @@ module.exports = { }, options: { responsive: false, - legend: false, - title: false, elements: { point: { pointStyle: imageCanvas, diff --git a/test/fixtures/element.point/point-style-line.json b/test/fixtures/element.point/point-style-line.json index 7260455df..4f2490a3f 100644 --- a/test/fixtures/element.point/point-style-line.json +++ b/test/fixtures/element.point/point-style-line.json @@ -42,8 +42,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "elements": { "point": { "pointStyle": "line" diff --git a/test/fixtures/element.point/point-style-rect-rot.json b/test/fixtures/element.point/point-style-rect-rot.json index 642b400e4..56dc2584f 100644 --- a/test/fixtures/element.point/point-style-rect-rot.json +++ b/test/fixtures/element.point/point-style-rect-rot.json @@ -42,8 +42,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "elements": { "point": { "pointStyle": "rectRot" diff --git a/test/fixtures/element.point/point-style-rect-rounded.json b/test/fixtures/element.point/point-style-rect-rounded.json index d99d03c44..ae7ef93f8 100644 --- a/test/fixtures/element.point/point-style-rect-rounded.json +++ b/test/fixtures/element.point/point-style-rect-rounded.json @@ -42,8 +42,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "elements": { "point": { "pointStyle": "rectRounded" diff --git a/test/fixtures/element.point/point-style-rect.json b/test/fixtures/element.point/point-style-rect.json index 1d0c361f9..2d97ee34a 100644 --- a/test/fixtures/element.point/point-style-rect.json +++ b/test/fixtures/element.point/point-style-rect.json @@ -42,8 +42,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "elements": { "point": { "pointStyle": "rect" diff --git a/test/fixtures/element.point/point-style-star.json b/test/fixtures/element.point/point-style-star.json index 62808cca0..7996fd5b0 100644 --- a/test/fixtures/element.point/point-style-star.json +++ b/test/fixtures/element.point/point-style-star.json @@ -42,8 +42,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "elements": { "point": { "pointStyle": "star" diff --git a/test/fixtures/element.point/point-style-triangle.json b/test/fixtures/element.point/point-style-triangle.json index 46c510ede..74692ee5a 100644 --- a/test/fixtures/element.point/point-style-triangle.json +++ b/test/fixtures/element.point/point-style-triangle.json @@ -42,8 +42,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "elements": { "point": { "pointStyle": "triangle" diff --git a/test/fixtures/element.point/rotation.js b/test/fixtures/element.point/rotation.js index 12087d88f..2d2971d65 100644 --- a/test/fixtures/element.point/rotation.js +++ b/test/fixtures/element.point/rotation.js @@ -21,8 +21,6 @@ module.exports = { }, options: { responsive: false, - legend: false, - title: false, elements: { point: { rotation: angles, diff --git a/test/fixtures/mixed/bar+line.js b/test/fixtures/mixed/bar+line.js index f66fd2662..a351b560f 100644 --- a/test/fixtures/mixed/bar+line.js +++ b/test/fixtures/mixed/bar+line.js @@ -18,8 +18,6 @@ module.exports = { }, options: { indexAxis: 'y', - legend: false, - title: false, scales: { horz: { position: 'top' diff --git a/test/fixtures/plugin.filler/fill-line-boundary-end-span.json b/test/fixtures/plugin.filler/fill-line-boundary-end-span.json index cab5f703a..4f806cdb5 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-end-span.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-end-span.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -39,6 +37,11 @@ "fill": "end", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-boundary-end.json b/test/fixtures/plugin.filler/fill-line-boundary-end.json index 8cd8146bc..08cce0822 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-end.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-end.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -39,6 +37,11 @@ "fill": "end", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-span-dual.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-span-dual.json index 62527f938..599fced3b 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-origin-span-dual.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-origin-span-dual.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -42,6 +40,11 @@ }, "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-span.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-span.json index 23ee0bfdd..967d5c463 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-origin-span.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-origin-span.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -39,6 +37,11 @@ "fill": "origin", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-above.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-above.json index 265eb0b1a..a67e9bee2 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-above.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-above.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -42,6 +40,11 @@ "below": "transparent" } } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.json index f7c1c2c4e..893edc08a 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -39,6 +37,11 @@ "borderColor": "transparent", "fill": "origin" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.json index 73d450e42..1dd7757d4 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -39,6 +37,11 @@ "borderColor": "transparent", "fill": "origin" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.json index 10a0590fd..2cf37caaf 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -40,6 +38,11 @@ "stepped": true, "fill": "origin" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.json index 7d795b2a1..8b8c91fe0 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -40,6 +38,11 @@ "stepped": true, "fill": "origin" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin.json b/test/fixtures/plugin.filler/fill-line-boundary-origin.json index bb490bf8a..b7d518711 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-origin.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-origin.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -39,6 +37,11 @@ "fill": "origin", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-boundary-start-span.json b/test/fixtures/plugin.filler/fill-line-boundary-start-span.json index 948d70367..ef6f21cd2 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-start-span.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-start-span.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -39,6 +37,11 @@ "fill": "start", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-boundary-start.json b/test/fixtures/plugin.filler/fill-line-boundary-start.json index 956135f77..1e2815e54 100644 --- a/test/fixtures/plugin.filler/fill-line-boundary-start.json +++ b/test/fixtures/plugin.filler/fill-line-boundary-start.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -39,6 +37,11 @@ "fill": "start", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-dataset-border.json b/test/fixtures/plugin.filler/fill-line-dataset-border.json index 08efb45f1..13342bb58 100644 --- a/test/fixtures/plugin.filler/fill-line-dataset-border.json +++ b/test/fixtures/plugin.filler/fill-line-dataset-border.json @@ -28,8 +28,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -47,6 +45,11 @@ "borderWidth": 5, "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-dataset-dual.json b/test/fixtures/plugin.filler/fill-line-dataset-dual.json index 65f960b1c..7e8fec460 100644 --- a/test/fixtures/plugin.filler/fill-line-dataset-dual.json +++ b/test/fixtures/plugin.filler/fill-line-dataset-dual.json @@ -18,8 +18,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -36,6 +34,11 @@ "borderColor": "transparent", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-dataset-interpolated.js b/test/fixtures/plugin.filler/fill-line-dataset-interpolated.js index bfba6fd72..899da0a23 100644 --- a/test/fixtures/plugin.filler/fill-line-dataset-interpolated.js +++ b/test/fixtures/plugin.filler/fill-line-dataset-interpolated.js @@ -39,8 +39,6 @@ module.exports = { options: { animation: false, responsive: false, - legend: false, - title: false, line: { datasets: { tension: 0.4, @@ -48,6 +46,11 @@ module.exports = { pointRadius: 1.5, } }, + plugins: { + legend: false, + title: false, + tooltip: false + }, scales: { x: { type: 'linear', diff --git a/test/fixtures/plugin.filler/fill-line-dataset-span-dual.json b/test/fixtures/plugin.filler/fill-line-dataset-span-dual.json index 1d57b86cd..cb2a3abcd 100644 --- a/test/fixtures/plugin.filler/fill-line-dataset-span-dual.json +++ b/test/fixtures/plugin.filler/fill-line-dataset-span-dual.json @@ -40,8 +40,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -59,6 +57,11 @@ "borderColor": "transparent", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-dataset-span.json b/test/fixtures/plugin.filler/fill-line-dataset-span.json index e3d198df7..d1fa6e740 100644 --- a/test/fixtures/plugin.filler/fill-line-dataset-span.json +++ b/test/fixtures/plugin.filler/fill-line-dataset-span.json @@ -28,8 +28,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -46,6 +44,11 @@ "borderColor": "transparent", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline-span-above.json b/test/fixtures/plugin.filler/fill-line-dataset-spline-span-above.json index aaa3b0a22..5705220aa 100644 --- a/test/fixtures/plugin.filler/fill-line-dataset-spline-span-above.json +++ b/test/fixtures/plugin.filler/fill-line-dataset-spline-span-above.json @@ -36,8 +36,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -54,6 +52,11 @@ "cubicInterpolationMode": "monotone", "borderColor": "transparent" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline-span-below.json b/test/fixtures/plugin.filler/fill-line-dataset-spline-span-below.json index 35de98ed2..4c874c402 100644 --- a/test/fixtures/plugin.filler/fill-line-dataset-spline-span-below.json +++ b/test/fixtures/plugin.filler/fill-line-dataset-spline-span-below.json @@ -36,8 +36,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -54,6 +52,11 @@ "cubicInterpolationMode": "monotone", "borderColor": "transparent" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline-span.json b/test/fixtures/plugin.filler/fill-line-dataset-spline-span.json index dfa414453..aa7c8e7ea 100644 --- a/test/fixtures/plugin.filler/fill-line-dataset-spline-span.json +++ b/test/fixtures/plugin.filler/fill-line-dataset-spline-span.json @@ -28,8 +28,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -46,6 +44,11 @@ "cubicInterpolationMode": "monotone", "borderColor": "transparent" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline.json b/test/fixtures/plugin.filler/fill-line-dataset-spline.json index 81c161d63..18d69b737 100644 --- a/test/fixtures/plugin.filler/fill-line-dataset-spline.json +++ b/test/fixtures/plugin.filler/fill-line-dataset-spline.json @@ -28,8 +28,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -46,6 +44,11 @@ "cubicInterpolationMode": "monotone", "borderColor": "transparent" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-dataset-stepped.json b/test/fixtures/plugin.filler/fill-line-dataset-stepped.json index 944904673..ad6bd55ae 100644 --- a/test/fixtures/plugin.filler/fill-line-dataset-stepped.json +++ b/test/fixtures/plugin.filler/fill-line-dataset-stepped.json @@ -33,8 +33,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -50,6 +48,11 @@ "line": { "borderColor": "black" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-dataset.json b/test/fixtures/plugin.filler/fill-line-dataset.json index 26a72fbd2..efd5dfaf9 100644 --- a/test/fixtures/plugin.filler/fill-line-dataset.json +++ b/test/fixtures/plugin.filler/fill-line-dataset.json @@ -28,8 +28,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -46,6 +44,11 @@ "borderColor": "transparent", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-stack.json b/test/fixtures/plugin.filler/fill-line-stack.json index 6e5e951f3..44ca45489 100644 --- a/test/fixtures/plugin.filler/fill-line-stack.json +++ b/test/fixtures/plugin.filler/fill-line-stack.json @@ -32,8 +32,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -52,6 +50,11 @@ "borderColor": "transparent", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-line-value.json b/test/fixtures/plugin.filler/fill-line-value.json index f8520ea6e..b89abdfba 100644 --- a/test/fixtures/plugin.filler/fill-line-value.json +++ b/test/fixtures/plugin.filler/fill-line-value.json @@ -12,8 +12,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scales": { "x": { "display": false @@ -30,6 +28,11 @@ "borderColor": "transparent", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end-circular.json b/test/fixtures/plugin.filler/fill-radar-boundary-end-circular.json index 4a8553bc2..65e6db8a9 100644 --- a/test/fixtures/plugin.filler/fill-radar-boundary-end-circular.json +++ b/test/fixtures/plugin.filler/fill-radar-boundary-end-circular.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scale": { "display": false, "gridLines": { @@ -36,6 +34,11 @@ "borderColor": "transparent", "fill": "end" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end-span.json b/test/fixtures/plugin.filler/fill-radar-boundary-end-span.json index 29b444a72..5196559e9 100644 --- a/test/fixtures/plugin.filler/fill-radar-boundary-end-span.json +++ b/test/fixtures/plugin.filler/fill-radar-boundary-end-span.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scale": { "display": false }, @@ -33,6 +31,11 @@ "borderColor": "transparent", "fill": "end" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end.json b/test/fixtures/plugin.filler/fill-radar-boundary-end.json index f72562596..94b755041 100644 --- a/test/fixtures/plugin.filler/fill-radar-boundary-end.json +++ b/test/fixtures/plugin.filler/fill-radar-boundary-end.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scale": { "display": false }, @@ -33,6 +31,11 @@ "borderColor": "transparent", "fill": "end" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.json index 5e2e08789..51538c87a 100644 --- a/test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.json +++ b/test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scale": { "display": false, "gridLines": { @@ -36,6 +34,11 @@ "borderColor": "transparent", "fill": "origin" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-span.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin-span.json index 7b72cf4d5..17514471f 100644 --- a/test/fixtures/plugin.filler/fill-radar-boundary-origin-span.json +++ b/test/fixtures/plugin.filler/fill-radar-boundary-origin-span.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scale": { "display": false }, @@ -33,6 +31,11 @@ "borderColor": "transparent", "fill": "origin" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.json index 6e99d203c..138a3a0fc 100644 --- a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.json +++ b/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scale": { "display": false }, @@ -34,6 +32,11 @@ "tension": 0.5, "fill": "origin" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json index caf1a4e6a..7689972c7 100644 --- a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json +++ b/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scale": { "display": false }, @@ -34,6 +32,11 @@ "tension": 0.5, "fill": "origin" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin.json index e4f52186e..20abe5ce6 100644 --- a/test/fixtures/plugin.filler/fill-radar-boundary-origin.json +++ b/test/fixtures/plugin.filler/fill-radar-boundary-origin.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scale": { "display": false }, @@ -33,6 +31,11 @@ "borderColor": "transparent", "fill": "origin" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-start-circular.json b/test/fixtures/plugin.filler/fill-radar-boundary-start-circular.json index bbd7c7428..a45fccd55 100644 --- a/test/fixtures/plugin.filler/fill-radar-boundary-start-circular.json +++ b/test/fixtures/plugin.filler/fill-radar-boundary-start-circular.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scale": { "display": false, "gridLines": { @@ -36,6 +34,11 @@ "borderColor": "transparent", "fill": "start" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-start-span.json b/test/fixtures/plugin.filler/fill-radar-boundary-start-span.json index 2f59ccf10..0ae3843d8 100644 --- a/test/fixtures/plugin.filler/fill-radar-boundary-start-span.json +++ b/test/fixtures/plugin.filler/fill-radar-boundary-start-span.json @@ -20,8 +20,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scale": { "display": false }, @@ -33,6 +31,11 @@ "borderColor": "transparent", "fill": "start" } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-border.json b/test/fixtures/plugin.filler/fill-radar-dataset-border.json index 6881fbb6f..a42f5648c 100644 --- a/test/fixtures/plugin.filler/fill-radar-dataset-border.json +++ b/test/fixtures/plugin.filler/fill-radar-dataset-border.json @@ -28,8 +28,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scale": { "display": false }, @@ -42,6 +40,11 @@ "borderWidth": 5, "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-order.js b/test/fixtures/plugin.filler/fill-radar-dataset-order.js index 882be8113..f24fc306f 100644 --- a/test/fixtures/plugin.filler/fill-radar-dataset-order.js +++ b/test/fixtures/plugin.filler/fill-radar-dataset-order.js @@ -18,8 +18,11 @@ module.exports = { ] }, options: { - legend: false, - title: false, + plugins: { + legend: false, + title: false, + tooltip: false + }, scale: { display: false } diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-span.json b/test/fixtures/plugin.filler/fill-radar-dataset-span.json index 537adae21..dd57cc5c1 100644 --- a/test/fixtures/plugin.filler/fill-radar-dataset-span.json +++ b/test/fixtures/plugin.filler/fill-radar-dataset-span.json @@ -28,8 +28,6 @@ "options": { "responsive": false, "spanGaps": true, - "legend": false, - "title": false, "scale": { "display": false }, @@ -41,6 +39,11 @@ "borderColor": "transparent", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-dataset.json b/test/fixtures/plugin.filler/fill-radar-dataset.json index f1d68114e..e4cd431b5 100644 --- a/test/fixtures/plugin.filler/fill-radar-dataset.json +++ b/test/fixtures/plugin.filler/fill-radar-dataset.json @@ -28,8 +28,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scale": { "display": false }, @@ -41,6 +39,11 @@ "borderColor": "transparent", "tension": 0 } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/plugin.filler/fill-radar-value.json b/test/fixtures/plugin.filler/fill-radar-value.json index f56be396e..d6e91c240 100644 --- a/test/fixtures/plugin.filler/fill-radar-value.json +++ b/test/fixtures/plugin.filler/fill-radar-value.json @@ -11,8 +11,6 @@ "options": { "responsive": false, "spanGaps": false, - "legend": false, - "title": false, "scale": { "display": false, "gridLines": { @@ -27,6 +25,11 @@ "borderColor": "transparent", "fill": { "value": 3 } } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false } } }, diff --git a/test/fixtures/core.tooltip/opacity.js b/test/fixtures/plugin.tooltip/opacity.js similarity index 96% rename from test/fixtures/core.tooltip/opacity.js rename to test/fixtures/plugin.tooltip/opacity.js index 43bd725b4..3fef618f0 100644 --- a/test/fixtures/core.tooltip/opacity.js +++ b/test/fixtures/plugin.tooltip/opacity.js @@ -35,8 +35,6 @@ module.exports = { labels: ['', '', '', '', '', '', '', '', '', '', ''] }, options: { - legend: false, - title: false, scales: { x: {display: false}, y: {display: false} @@ -46,6 +44,11 @@ module.exports = { fill: false } }, + plugins: { + legend: false, + title: false, + filler: false + }, tooltips: { mode: 'nearest', intersect: false, diff --git a/test/fixtures/core.tooltip/opacity.png b/test/fixtures/plugin.tooltip/opacity.png similarity index 100% rename from test/fixtures/core.tooltip/opacity.png rename to test/fixtures/plugin.tooltip/opacity.png diff --git a/test/fixtures/core.tooltip/point-style.js b/test/fixtures/plugin.tooltip/point-style.js similarity index 95% rename from test/fixtures/core.tooltip/point-style.js rename to test/fixtures/plugin.tooltip/point-style.js index 2579f3959..de60be92f 100644 --- a/test/fixtures/core.tooltip/point-style.js +++ b/test/fixtures/plugin.tooltip/point-style.js @@ -18,8 +18,6 @@ module.exports = { labels: pointStyles.map(() => '') }, options: { - legend: false, - title: false, scales: { x: {display: false}, y: {display: false} @@ -29,6 +27,11 @@ module.exports = { fill: false } }, + plugins: { + legend: false, + title: false, + filler: false + }, tooltips: { mode: 'nearest', intersect: false, diff --git a/test/fixtures/core.tooltip/point-style.png b/test/fixtures/plugin.tooltip/point-style.png similarity index 100% rename from test/fixtures/core.tooltip/point-style.png rename to test/fixtures/plugin.tooltip/point-style.png diff --git a/test/fixtures/scale.category/ticks-from-data.js b/test/fixtures/scale.category/ticks-from-data.js index 47c643ecc..61da56d3b 100644 --- a/test/fixtures/scale.category/ticks-from-data.js +++ b/test/fixtures/scale.category/ticks-from-data.js @@ -10,8 +10,6 @@ module.exports = { }, options: { indexAxis: 'y', - legend: false, - title: false, elements: { bar: { backgroundColor: '#AAAAAA80', diff --git a/test/fixtures/scale.linear/tiny-numbers.png b/test/fixtures/scale.linear/tiny-numbers.png index d3c0f75ab..bc537d10a 100644 Binary files a/test/fixtures/scale.linear/tiny-numbers.png and b/test/fixtures/scale.linear/tiny-numbers.png differ diff --git a/test/fixtures/scale.radialLinear/anglelines-disable.json b/test/fixtures/scale.radialLinear/anglelines-disable.json index 40c3dc602..21b6b5eb3 100644 --- a/test/fixtures/scale.radialLinear/anglelines-disable.json +++ b/test/fixtures/scale.radialLinear/anglelines-disable.json @@ -6,8 +6,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scale": { "gridLines": { "color": "rgb(0, 0, 0)", diff --git a/test/fixtures/scale.radialLinear/anglelines-indexable.js b/test/fixtures/scale.radialLinear/anglelines-indexable.js index f7f9b768f..1b2beac62 100644 --- a/test/fixtures/scale.radialLinear/anglelines-indexable.js +++ b/test/fixtures/scale.radialLinear/anglelines-indexable.js @@ -6,8 +6,6 @@ module.exports = { }, options: { responsive: false, - legend: false, - title: false, scale: { gridLines: { display: true, diff --git a/test/fixtures/scale.radialLinear/anglelines-scriptable.js b/test/fixtures/scale.radialLinear/anglelines-scriptable.js index b07b08a39..fad8dedb9 100644 --- a/test/fixtures/scale.radialLinear/anglelines-scriptable.js +++ b/test/fixtures/scale.radialLinear/anglelines-scriptable.js @@ -6,8 +6,6 @@ module.exports = { }, options: { responsive: false, - legend: false, - title: false, scale: { gridLines: { display: true, diff --git a/test/fixtures/scale.radialLinear/border-dash.json b/test/fixtures/scale.radialLinear/border-dash.json index 5a28ffab0..6d9e3b879 100644 --- a/test/fixtures/scale.radialLinear/border-dash.json +++ b/test/fixtures/scale.radialLinear/border-dash.json @@ -6,8 +6,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scale": { "gridLines": { "color": "rgba(0, 0, 255, 0.5)", diff --git a/test/fixtures/scale.radialLinear/circular-border-dash.json b/test/fixtures/scale.radialLinear/circular-border-dash.json index b69250de9..a1afb2ec9 100644 --- a/test/fixtures/scale.radialLinear/circular-border-dash.json +++ b/test/fixtures/scale.radialLinear/circular-border-dash.json @@ -6,8 +6,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scale": { "gridLines": { "circular": true, diff --git a/test/fixtures/scale.radialLinear/gridlines-disable.json b/test/fixtures/scale.radialLinear/gridlines-disable.json index 5f38d1176..bc5c60ed4 100644 --- a/test/fixtures/scale.radialLinear/gridlines-disable.json +++ b/test/fixtures/scale.radialLinear/gridlines-disable.json @@ -6,8 +6,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scale": { "gridLines": { "display": false diff --git a/test/fixtures/scale.radialLinear/gridlines-no-z.json b/test/fixtures/scale.radialLinear/gridlines-no-z.json index 362c51904..50b4d202b 100644 --- a/test/fixtures/scale.radialLinear/gridlines-no-z.json +++ b/test/fixtures/scale.radialLinear/gridlines-no-z.json @@ -10,8 +10,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scale": { "gridLines": { "color": "rgba(0, 0, 0, 1)", @@ -27,6 +25,12 @@ "ticks": { "display": false } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false, + "filler": true } } } diff --git a/test/fixtures/scale.radialLinear/gridlines-scriptable.js b/test/fixtures/scale.radialLinear/gridlines-scriptable.js index 5d37593fe..5283884cc 100644 --- a/test/fixtures/scale.radialLinear/gridlines-scriptable.js +++ b/test/fixtures/scale.radialLinear/gridlines-scriptable.js @@ -6,8 +6,6 @@ module.exports = { }, options: { responsive: false, - legend: false, - title: false, scale: { gridLines: { display: true, diff --git a/test/fixtures/scale.radialLinear/gridlines-z.json b/test/fixtures/scale.radialLinear/gridlines-z.json index add497b9a..4da021e0c 100644 --- a/test/fixtures/scale.radialLinear/gridlines-z.json +++ b/test/fixtures/scale.radialLinear/gridlines-z.json @@ -10,8 +10,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scale": { "gridLines": { "color": "rgba(0, 0, 0, 1)", @@ -28,7 +26,13 @@ "ticks": { "display": false } - } + }, + "plugins": { + "legend": false, + "title": false, + "tooltip": false, + "filler": true + } } } } diff --git a/test/fixtures/scale.radialLinear/indexable-gridlines.json b/test/fixtures/scale.radialLinear/indexable-gridlines.json index add191b8d..d10b0d81f 100644 --- a/test/fixtures/scale.radialLinear/indexable-gridlines.json +++ b/test/fixtures/scale.radialLinear/indexable-gridlines.json @@ -6,8 +6,6 @@ }, "options": { "responsive": false, - "legend": false, - "title": false, "scale": { "gridLines": { "display": true, diff --git a/test/fixtures/scale.time/autoskip-major.js b/test/fixtures/scale.time/autoskip-major.js index 1c693e824..f09f27a43 100644 --- a/test/fixtures/scale.time/autoskip-major.js +++ b/test/fixtures/scale.time/autoskip-major.js @@ -32,8 +32,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/bar-large-gap-between-data.js b/test/fixtures/scale.time/bar-large-gap-between-data.js index 7b1017251..1b1654cae 100644 --- a/test/fixtures/scale.time/bar-large-gap-between-data.js +++ b/test/fixtures/scale.time/bar-large-gap-between-data.js @@ -32,7 +32,6 @@ module.exports = { }] }, options: { - legend: false, scales: { x: { display: false, diff --git a/test/fixtures/scale.time/custom-parser.js b/test/fixtures/scale.time/custom-parser.js index d3b516ff4..c34193dbd 100644 --- a/test/fixtures/scale.time/custom-parser.js +++ b/test/fixtures/scale.time/custom-parser.js @@ -30,8 +30,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/data-ty.js b/test/fixtures/scale.time/data-ty.js index 6fff2a486..507a4fc80 100644 --- a/test/fixtures/scale.time/data-ty.js +++ b/test/fixtures/scale.time/data-ty.js @@ -48,8 +48,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/data-xy.js b/test/fixtures/scale.time/data-xy.js index c0288bbca..7230312b5 100644 --- a/test/fixtures/scale.time/data-xy.js +++ b/test/fixtures/scale.time/data-xy.js @@ -45,8 +45,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/labels-date.js b/test/fixtures/scale.time/labels-date.js index d7cdd5e7c..9bd823297 100644 --- a/test/fixtures/scale.time/labels-date.js +++ b/test/fixtures/scale.time/labels-date.js @@ -18,8 +18,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/labels-strings.js b/test/fixtures/scale.time/labels-strings.js index 0e7eb1e6a..28b92b239 100644 --- a/test/fixtures/scale.time/labels-strings.js +++ b/test/fixtures/scale.time/labels-strings.js @@ -13,8 +13,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/labels.js b/test/fixtures/scale.time/labels.js index 78f300cde..071b6ec00 100644 --- a/test/fixtures/scale.time/labels.js +++ b/test/fixtures/scale.time/labels.js @@ -37,8 +37,7 @@ module.exports = { labels: ['2005', '2006', '2007'], time: timeOpts } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/negative-times.js b/test/fixtures/scale.time/negative-times.js index a1863336d..5db06c412 100644 --- a/test/fixtures/scale.time/negative-times.js +++ b/test/fixtures/scale.time/negative-times.js @@ -26,7 +26,11 @@ module.exports = { } } }, - legend: false + plugins: { + legend: false, + title: false, + tooltip: false + } } }, options: { diff --git a/test/fixtures/scale.time/source-auto-linear.js b/test/fixtures/scale.time/source-auto-linear.js index 5ef72099e..cc6e961ed 100644 --- a/test/fixtures/scale.time/source-auto-linear.js +++ b/test/fixtures/scale.time/source-auto-linear.js @@ -22,8 +22,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/source-data-linear.js b/test/fixtures/scale.time/source-data-linear.js index a8492cf77..3133979ab 100644 --- a/test/fixtures/scale.time/source-data-linear.js +++ b/test/fixtures/scale.time/source-data-linear.js @@ -22,8 +22,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/source-labels-linear-offset-min-max.js b/test/fixtures/scale.time/source-labels-linear-offset-min-max.js index 96be59c23..3420dca5c 100644 --- a/test/fixtures/scale.time/source-labels-linear-offset-min-max.js +++ b/test/fixtures/scale.time/source-labels-linear-offset-min-max.js @@ -24,8 +24,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/source-labels-linear.js b/test/fixtures/scale.time/source-labels-linear.js index 635e4fa0e..2eb1f145e 100644 --- a/test/fixtures/scale.time/source-labels-linear.js +++ b/test/fixtures/scale.time/source-labels-linear.js @@ -22,8 +22,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/ticks-capacity.js b/test/fixtures/scale.time/ticks-capacity.js index bc950bd47..67961f39b 100644 --- a/test/fixtures/scale.time/ticks-capacity.js +++ b/test/fixtures/scale.time/ticks-capacity.js @@ -19,8 +19,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/ticks-minunit.js b/test/fixtures/scale.time/ticks-minunit.js index 84bf001c5..b3892361d 100644 --- a/test/fixtures/scale.time/ticks-minunit.js +++ b/test/fixtures/scale.time/ticks-minunit.js @@ -17,8 +17,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/ticks-reverse-linear-min-max.js b/test/fixtures/scale.time/ticks-reverse-linear-min-max.js index 054ac4f00..9d716e57c 100644 --- a/test/fixtures/scale.time/ticks-reverse-linear-min-max.js +++ b/test/fixtures/scale.time/ticks-reverse-linear-min-max.js @@ -24,8 +24,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/ticks-reverse-linear.js b/test/fixtures/scale.time/ticks-reverse-linear.js index 1b122651e..54651cb22 100644 --- a/test/fixtures/scale.time/ticks-reverse-linear.js +++ b/test/fixtures/scale.time/ticks-reverse-linear.js @@ -22,8 +22,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/ticks-reverse-offset.js b/test/fixtures/scale.time/ticks-reverse-offset.js index 6db92bf94..c8e5d49aa 100644 --- a/test/fixtures/scale.time/ticks-reverse-offset.js +++ b/test/fixtures/scale.time/ticks-reverse-offset.js @@ -23,8 +23,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/ticks-reverse.js b/test/fixtures/scale.time/ticks-reverse.js index 7358113ca..0a28ab06a 100644 --- a/test/fixtures/scale.time/ticks-reverse.js +++ b/test/fixtures/scale.time/ticks-reverse.js @@ -22,8 +22,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/ticks-round.js b/test/fixtures/scale.time/ticks-round.js index 7e313b9f4..86ed3d763 100644 --- a/test/fixtures/scale.time/ticks-round.js +++ b/test/fixtures/scale.time/ticks-round.js @@ -18,8 +18,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/ticks-stepsize.js b/test/fixtures/scale.time/ticks-stepsize.js index 3b62bb19e..2cf92675d 100644 --- a/test/fixtures/scale.time/ticks-stepsize.js +++ b/test/fixtures/scale.time/ticks-stepsize.js @@ -18,8 +18,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.time/ticks-unit.js b/test/fixtures/scale.time/ticks-unit.js index fce6214fd..3cd7a8c32 100644 --- a/test/fixtures/scale.time/ticks-unit.js +++ b/test/fixtures/scale.time/ticks-unit.js @@ -16,8 +16,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.timeseries/financial-daily.png b/test/fixtures/scale.timeseries/financial-daily.png index d62f8946c..9fa48c7da 100644 Binary files a/test/fixtures/scale.timeseries/financial-daily.png and b/test/fixtures/scale.timeseries/financial-daily.png differ diff --git a/test/fixtures/scale.timeseries/source-auto.js b/test/fixtures/scale.timeseries/source-auto.js index 205a9cfca..ee67a5b64 100644 --- a/test/fixtures/scale.timeseries/source-auto.js +++ b/test/fixtures/scale.timeseries/source-auto.js @@ -21,8 +21,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.timeseries/source-data-offset-min-max.js b/test/fixtures/scale.timeseries/source-data-offset-min-max.js index d71882f79..d82a8dd0b 100644 --- a/test/fixtures/scale.timeseries/source-data-offset-min-max.js +++ b/test/fixtures/scale.timeseries/source-data-offset-min-max.js @@ -23,8 +23,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.timeseries/source-data.js b/test/fixtures/scale.timeseries/source-data.js index a9b6f28da..b835cd90b 100644 --- a/test/fixtures/scale.timeseries/source-data.js +++ b/test/fixtures/scale.timeseries/source-data.js @@ -21,8 +21,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.timeseries/source-labels-offset-min-max.js b/test/fixtures/scale.timeseries/source-labels-offset-min-max.js index 04f2219e0..58dabaa1a 100644 --- a/test/fixtures/scale.timeseries/source-labels-offset-min-max.js +++ b/test/fixtures/scale.timeseries/source-labels-offset-min-max.js @@ -23,8 +23,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.timeseries/source-labels.js b/test/fixtures/scale.timeseries/source-labels.js index 55e5486ed..8b2de21ff 100644 --- a/test/fixtures/scale.timeseries/source-labels.js +++ b/test/fixtures/scale.timeseries/source-labels.js @@ -21,8 +21,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.timeseries/ticks-reverse-max.js b/test/fixtures/scale.timeseries/ticks-reverse-max.js index 3a7a6a2eb..41d10fc31 100644 --- a/test/fixtures/scale.timeseries/ticks-reverse-max.js +++ b/test/fixtures/scale.timeseries/ticks-reverse-max.js @@ -22,8 +22,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.timeseries/ticks-reverse-min-max.js b/test/fixtures/scale.timeseries/ticks-reverse-min-max.js index b50b236d1..9a9a74e2c 100644 --- a/test/fixtures/scale.timeseries/ticks-reverse-min-max.js +++ b/test/fixtures/scale.timeseries/ticks-reverse-min-max.js @@ -23,8 +23,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.timeseries/ticks-reverse-min.js b/test/fixtures/scale.timeseries/ticks-reverse-min.js index 90ec1789a..c1a7c72f1 100644 --- a/test/fixtures/scale.timeseries/ticks-reverse-min.js +++ b/test/fixtures/scale.timeseries/ticks-reverse-min.js @@ -22,8 +22,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/fixtures/scale.timeseries/ticks-reverse.js b/test/fixtures/scale.timeseries/ticks-reverse.js index bfb597ccd..46e75e1dd 100644 --- a/test/fixtures/scale.timeseries/ticks-reverse.js +++ b/test/fixtures/scale.timeseries/ticks-reverse.js @@ -21,8 +21,7 @@ module.exports = { y: { display: false } - }, - legend: false + } } }, options: { diff --git a/test/specs/core.plugin.tests.js b/test/specs/core.plugin.tests.js index a2df9334e..a84ed9bef 100644 --- a/test/specs/core.plugin.tests.js +++ b/test/specs/core.plugin.tests.js @@ -324,5 +324,21 @@ describe('Chart.plugins', function() { expect(plugin.hook).toHaveBeenCalled(); expect(plugin.hook.calls.first().args[1]).toEqual({bar: 'bar'}); }); + + it('should disable all plugins', function() { + var plugin = {id: 'a', hook: function() {}}; + var chart = window.acquireChart({ + plugins: [plugin], + options: { + plugins: false + } + }); + + spyOn(plugin, 'hook'); + + chart._plugins.notify(chart, 'hook'); + + expect(plugin.hook).not.toHaveBeenCalled(); + }); }); });