language
stringclasses
1 value
owner
stringlengths
2
15
repo
stringlengths
2
21
sha
stringlengths
45
45
message
stringlengths
7
36.3k
path
stringlengths
1
199
patch
stringlengths
15
102k
is_multipart
bool
2 classes
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/charts/line/point-sizes.html
@@ -97,20 +97,20 @@ mode: 'index' }, scales: { - xAxes: [{ + x: { display: true, scaleLabel: { display: true, labelString: 'Month' } - }], - yAxes: [{ + }, + y: { display: true, scaleLabel: { display: true, labelString: 'Value' } - }] + } }, title: { display: true,
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/charts/line/skip-points.html
@@ -67,20 +67,20 @@ mode: 'index' }, scales: { - xAxes: [{ + x: { display: true, scaleLabel: { display: true, labelString: 'Month' } - }], - yAxes: [{ + }, + y: { display: true, scaleLabel: { display: true, labelString: 'Value' }, - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/charts/scatter/multi-axis.html
@@ -24,8 +24,8 @@ var scatterChartData = { datasets: [{ label: 'My First dataset', - xAxisID: 'x-axis-1', - yAxisID: 'y-axis-1', + xAxisID: 'x', + yAxisID: 'y', borderColor: window.chartColors.red, backgroundColor: color(window.chartColors.red).alpha(0.2).rgbString(), data: [{ @@ -52,8 +52,8 @@ }] }, { label: 'My Second dataset', - xAxisID: 'x-axis-1', - yAxisID: 'y-axis-2', + xAxisID: 'x', + yAxisID: 'y2', borderColor: window.chartColors.blue, backgroundColor: color(window.chartColors.blue).alpha(0.2).rgbString(), data: [{ @@ -95,26 +95,25 @@ text: 'Chart.js Scatter Chart - Multi Axis' }, scales: { - xAxes: [{ + x: { position: 'bottom', - }], - yAxes: [{ + }, + y: { type: 'linear', // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance display: true, - position: 'left', - id: 'y-axis-1', - }, { + position: 'left' + }, + y2: { type: 'linear', // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance display: true, position: 'right', reverse: true, - id: 'y-axis-2', // grid line settings gridLines: { drawOnChartArea: false, // only want the grid lines for one axis to show up - }, - }], + } + } } } });
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/legend/callbacks.html
@@ -99,20 +99,20 @@ text: 'Chart.js Line Chart' }, scales: { - xAxes: [{ + x: { display: true, scaleLabel: { display: true, labelString: 'Month' } - }], - yAxes: [{ + }, + y: { display: true, scaleLabel: { display: true, labelString: 'Value' } - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/legend/point-style.html
@@ -68,20 +68,20 @@ } }, scales: { - xAxes: [{ + x: { display: true, scaleLabel: { display: true, labelString: 'Month' } - }], - yAxes: [{ + }, + y: { display: true, scaleLabel: { display: true, labelString: 'Value' } - }] + } }, title: { display: true,
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/legend/positioning.html
@@ -69,20 +69,20 @@ position: legendPosition, }, scales: { - xAxes: [{ + x: { display: true, scaleLabel: { display: true, labelString: 'Month' } - }], - yAxes: [{ + }, + y: { display: true, scaleLabel: { display: true, labelString: 'Value' } - }] + } }, title: { display: true,
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/filtering-labels.html
@@ -64,19 +64,19 @@ text: 'Chart.js Line Chart - X-Axis Filter' }, scales: { - xAxes: [{ + x: { display: true, ticks: { callback: function(dataLabel, index) { // Hide the label of every 2nd dataset. return null to hide the grid line too return index % 2 === 0 ? dataLabel : ''; } } - }], - yAxes: [{ + }, + y: { display: true, beginAtZero: false - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/gridlines-display.html
@@ -55,17 +55,17 @@ text: title }, scales: { - xAxes: [{ + x: { gridLines: gridlines - }], - yAxes: [{ + }, + y: { gridLines: gridlines, min: 0, max: 100, ticks: { stepSize: 10 } - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/gridlines-style.html
@@ -44,7 +44,7 @@ text: 'Grid Line Settings' }, scales: { - yAxes: [{ + y: { gridLines: { drawBorder: false, color: ['pink', 'red', 'orange', 'yellow', 'green', 'blue', 'indigo', 'purple'] @@ -54,7 +54,7 @@ ticks: { stepSize: 10 } - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/linear/min-max-suggested.html
@@ -44,13 +44,13 @@ text: 'Min and Max Settings' }, scales: { - yAxes: [{ + y: { // the data minimum used for determining the ticks is Math.min(dataMin, suggestedMin) suggestedMin: 10, // the data maximum used for determining the ticks is Math.max(dataMax, suggestedMax) suggestedMax: 50 - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/linear/min-max.html
@@ -44,10 +44,10 @@ text: 'Min and Max Settings' }, scales: { - yAxes: [{ + y: { min: 10, max: 50 - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/linear/step-size.html
@@ -81,14 +81,14 @@ intersect: true }, scales: { - xAxes: [{ + x: { display: true, scaleLabel: { display: true, labelString: 'Month' } - }], - yAxes: [{ + }, + y: { display: true, scaleLabel: { display: true, @@ -100,7 +100,7 @@ // forces step size to be 5 units stepSize: 5 } - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/logarithmic/line.html
@@ -65,13 +65,13 @@ text: 'Chart.js Line Chart - Logarithmic' }, scales: { - xAxes: [{ + x: { display: true, - }], - yAxes: [{ + }, + y: { display: true, type: 'logarithmic', - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/logarithmic/scatter.html
@@ -133,7 +133,7 @@ text: 'Chart.js Scatter Chart - Logarithmic X-Axis' }, scales: { - xAxes: [{ + x: { type: 'logarithmic', position: 'bottom', ticks: { @@ -149,8 +149,8 @@ labelString: 'Frequency', display: true, } - }], - yAxes: [{ + }, + y: { type: 'linear', ticks: { userCallback: function(tick) { @@ -161,7 +161,7 @@ labelString: 'Voltage', display: true } - }] + } } } });
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/non-numeric-y.html
@@ -39,14 +39,14 @@ text: 'Chart with Non Numeric Y Axis' }, scales: { - xAxes: [{ + x: { display: true, scaleLabel: { display: true, labelString: 'Month' } - }], - yAxes: [{ + }, + y: { type: 'category', position: 'left', display: true, @@ -55,7 +55,7 @@ labelString: 'Request State' }, reverse: true - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/time/combo.html
@@ -73,14 +73,14 @@ text: 'Chart.js Combo Time Scale' }, scales: { - xAxes: [{ + x: { type: 'time', display: true, offset: true, time: { unit: 'day' } - }], + }, }, } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/time/financial.html
@@ -115,7 +115,7 @@ duration: 0 }, scales: { - xAxes: [{ + x: { type: 'time', distribution: 'series', offset: true, @@ -156,16 +156,17 @@ lastMajor = currMajor; } } - }], - yAxes: [{ + }, + y: { + type: 'linear', gridLines: { drawBorder: false }, scaleLabel: { display: true, labelString: 'Closing price ($)' } - }] + } }, tooltips: { intersect: false,
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/time/line-point-data.html
@@ -82,7 +82,7 @@ text: 'Chart.js Time Point Data' }, scales: { - xAxes: [{ + x: { type: 'time', display: true, scaleLabel: { @@ -95,14 +95,14 @@ fontColor: '#FF0000' } } - }], - yAxes: [{ + }, + y: { display: true, scaleLabel: { display: true, labelString: 'value' } - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/time/line.html
@@ -103,7 +103,7 @@ text: 'Chart.js Time Scale' }, scales: { - xAxes: [{ + x: { type: 'time', time: { parser: timeFormat, @@ -114,13 +114,13 @@ display: true, labelString: 'Date' } - }], - yAxes: [{ + }, + y: { scaleLabel: { display: true, labelString: 'value' } - }] + } }, } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/scales/toggle-scale-type.html
@@ -67,13 +67,13 @@ text: 'Chart.js Line Chart - ' + type }, scales: { - xAxes: [{ + x: { display: true, - }], - yAxes: [{ + }, + y: { display: true, type: type - }] + } } } }; @@ -86,7 +86,7 @@ document.getElementById('toggleScale').addEventListener('click', function() { type = type === 'linear' ? 'logarithmic' : 'linear'; window.myLine.options.title.text = 'Chart.js Line Chart - ' + type; - window.myLine.options.scales.yAxes[0] = { + window.myLine.options.scales.y = { display: true, type: type };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
samples/tooltips/callbacks.html
@@ -79,20 +79,20 @@ intersect: true }, scales: { - xAxes: [{ + x: { display: true, scaleLabel: { show: true, labelString: 'Month' } - }], - yAxes: [{ + }, + y: { display: true, scaleLabel: { show: true, labelString: 'Value' } - }] + } } } };
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
src/controllers/controller.bar.js
@@ -13,17 +13,16 @@ defaults._set('bar', { }, scales: { - xAxes: [{ + x: { type: 'category', offset: true, gridLines: { offsetGridLines: true } - }], - - yAxes: [{ - type: 'linear' - }] + }, + y: { + type: 'linear', + } } }); @@ -221,13 +220,13 @@ module.exports = DatasetController.extend({ _parseObjectData: function(meta, data, start, count) { const iScale = meta.iScale; const vScale = meta.vScale; - const vProp = vScale._getAxis(); + const vProp = vScale.axis; const parsed = []; let i, ilen, item, obj, value; for (i = start, ilen = start + count; i < ilen; ++i) { obj = data[i]; item = {}; - item[iScale.id] = iScale._parseObject(obj, iScale._getAxis(), i); + item[iScale.id] = iScale._parseObject(obj, iScale.axis, i); value = obj[vProp]; if (helpers.isArray(value)) { parseFloatBar(value, item, vScale, i);
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
src/controllers/controller.bubble.js
@@ -10,16 +10,14 @@ var resolve = helpers.options.resolve; defaults._set('bubble', { scales: { - xAxes: [{ - type: 'linear', // bubble should probably use a linear scale by default - position: 'bottom', - id: 'x-axis-0' // need an ID so datasets can reference the scale - }], - yAxes: [{ + x: { type: 'linear', - position: 'left', - id: 'y-axis-0' - }] + position: 'bottom' + }, + y: { + type: 'linear', + position: 'left' + } }, tooltips: {
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
src/controllers/controller.horizontalBar.js
@@ -10,19 +10,18 @@ defaults._set('horizontalBar', { }, scales: { - xAxes: [{ + x: { type: 'linear', position: 'bottom' - }], - - yAxes: [{ + }, + y: { type: 'category', position: 'left', offset: true, gridLines: { offsetGridLines: true } - }] + } }, elements: {
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
src/controllers/controller.line.js
@@ -18,14 +18,12 @@ defaults._set('line', { }, scales: { - xAxes: [{ + x: { type: 'category', - id: 'x-axis-0' - }], - yAxes: [{ + }, + y: { type: 'linear', - id: 'y-axis-0' - }] + }, } });
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
src/controllers/controller.polarArea.js
@@ -8,17 +8,19 @@ var helpers = require('../helpers/index'); var resolve = helpers.options.resolve; defaults._set('polarArea', { - scale: { - type: 'radialLinear', - angleLines: { - display: false - }, - beginAtZero: true, - gridLines: { - circular: true - }, - pointLabels: { - display: false + scales: { + r: { + type: 'radialLinear', + angleLines: { + display: false + }, + beginAtZero: true, + gridLines: { + circular: true + }, + pointLabels: { + display: false + } } }, @@ -123,14 +125,14 @@ module.exports = DatasetController.extend({ * @private */ _getIndexScaleId: function() { - return this.chart.scale.id; + return this._cachedMeta.rAxisID; }, /** * @private */ _getValueScaleId: function() { - return this.chart.scale.id; + return this._cachedMeta.rAxisID; }, update: function(reset) { @@ -181,7 +183,7 @@ module.exports = DatasetController.extend({ const dataset = me.getDataset(); const opts = chart.options; const animationOpts = opts.animation; - const scale = chart.scale; + const scale = chart.scales.r; const centerX = scale.xCenter; const centerY = scale.yCenter; var i;
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
src/controllers/controller.radar.js
@@ -9,8 +9,10 @@ var valueOrDefault = helpers.valueOrDefault; defaults._set('radar', { spanGaps: false, - scale: { - type: 'radialLinear' + scales: { + r: { + type: 'radialLinear', + } }, elements: { line: { @@ -67,14 +69,14 @@ module.exports = DatasetController.extend({ * @private */ _getIndexScaleId: function() { - return this.chart.scale.id; + return this._cachedMeta.rAxisID; }, /** * @private */ _getValueScaleId: function() { - return this.chart.scale.id; + return this._cachedMeta.rAxisID; }, /** @@ -122,7 +124,7 @@ module.exports = DatasetController.extend({ updateElements: function(points, start, count, reset) { const me = this; const dataset = me.getDataset(); - const scale = me.chart.scale; + const scale = me.chart.scales.r; var i; for (i = start; i < start + count; i++) {
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
src/controllers/controller.scatter.js
@@ -5,16 +5,14 @@ var defaults = require('../core/core.defaults'); defaults._set('scatter', { scales: { - xAxes: [{ - id: 'x-axis-1', // need an ID so datasets can reference the scale - type: 'linear', // scatter should not use a category axis + x: { + type: 'linear', position: 'bottom' - }], - yAxes: [{ - id: 'y-axis-1', + }, + y: { type: 'linear', position: 'left' - }] + } }, tooltips: {
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
src/core/core.controller.js
@@ -35,44 +35,46 @@ defaults._set('global', { responsiveAnimationDuration: 0 }); -/** - * Recursively merge the given config objects representing the `scales` option - * by incorporating scale defaults in `xAxes` and `yAxes` array items, then - * returns a deep copy of the result, thus doesn't alter inputs. - */ -function mergeScaleConfig(/* config objects ... */) { - return helpers.merge({}, [].slice.call(arguments), { - merger: function(key, target, source, options) { - if (key === 'xAxes' || key === 'yAxes') { - var slen = source[key].length; - var i, type, scale; +function mergeScaleConfig(config, options) { + options = options || {}; + const chartDefaults = defaults[config.type] || {scales: {}}; + const configScales = options.scales || {}; + const firstIDs = {}; + const scales = {}; + + // First figure out first scale id's per axis. + // Note: for now, axis is determined from first letter of scale id! + Object.entries(configScales).forEach(([id, scale]) => { + const axis = id[0]; + firstIDs[axis] = firstIDs[axis] || id; + scales[id] = helpers.mergeIf({}, [scale, chartDefaults.scales[axis]]); + }); - if (!target[key]) { - target[key] = []; - } + // Backward compatibility + if (options.scale) { + scales[options.scale.id || 'r'] = helpers.mergeIf({}, [options.scale, chartDefaults.scales.r]); + firstIDs.r = firstIDs.r || options.scale.id || 'r'; + } - for (i = 0; i < slen; ++i) { - scale = source[key][i]; - type = valueOrDefault(scale.type, key === 'xAxes' ? 'category' : 'linear'); - - if (i >= target[key].length) { - target[key].push({}); - } - - if (!target[key][i].type || (scale.type && scale.type !== target[key][i].type)) { - // new/untyped scale or type changed: let's apply the new defaults - // then merge source scale to correctly overwrite the defaults. - helpers.merge(target[key][i], [scaleService.getScaleDefaults(type), scale]); - } else { - // scales type are the same - helpers.merge(target[key][i], scale); - } - } - } else { - helpers._merger(key, target, source, options); - } - } + // Then merge dataset defaults to scale configs + config.data.datasets.forEach(dataset => { + const datasetDefaults = defaults[dataset.type || config.type] || {scales: {}}; + Object.entries(datasetDefaults.scales || {}).forEach(([defaultID, defaultScaleOptions]) => { + const id = dataset[defaultID + 'AxisID'] || firstIDs[defaultID] || defaultID; + scales[id] = scales[id] || {}; + helpers.mergeIf(scales[id], [ + configScales[id], + defaultScaleOptions + ]); + }); }); + + // apply scale defaults, if not overridden by dataset defaults + Object.values(scales).forEach(scale => { + helpers.mergeIf(scale, scaleService.getScaleDefaults(scale.type)); + }); + + return scales; } /** @@ -83,16 +85,7 @@ function mergeScaleConfig(/* config objects ... */) { function mergeConfig(/* config objects ... */) { return helpers.merge({}, [].slice.call(arguments), { merger: function(key, target, source, options) { - var tval = target[key] || {}; - var sval = source[key]; - - if (key === 'scales') { - // scale config merging is complex. Add our own function here for that - target[key] = mergeScaleConfig(tval, sval); - } else if (key === 'scale') { - // used in polar area & radar charts since there is only one scale - target[key] = helpers.merge(tval, [scaleService.getScaleDefaults(sval.type), sval]); - } else { + if (key !== 'scales' && key !== 'scale') { helpers._merger(key, target, source, options); } } @@ -104,15 +97,19 @@ function initConfig(config) { // Do NOT use mergeConfig for the data object because this method merges arrays // and so would change references to labels and datasets, preventing data updates. - var data = config.data = config.data || {}; + const data = config.data = config.data || {}; data.datasets = data.datasets || []; data.labels = data.labels || []; + const scaleConfig = mergeScaleConfig(config, config.options); + config.options = mergeConfig( defaults.global, defaults[config.type], config.options || {}); + config.options.scales = scaleConfig; + return config; } @@ -131,12 +128,16 @@ function updateConfig(chart) { layouts.removeBox(chart, scale); }); + const scaleConfig = mergeScaleConfig(chart.config, newOptions); + newOptions = mergeConfig( defaults.global, defaults[chart.config.type], newOptions); chart.options = chart.config.options = newOptions; + chart.options.scales = scaleConfig; + chart._animationsDisabled = isAnimationDisabled(newOptions); chart.ensureScalesHaveIDs(); chart.buildOrUpdateScales(); @@ -146,19 +147,6 @@ function updateConfig(chart) { chart.tooltip.initialize(); } -function nextAvailableScaleId(axesOpts, prefix, index) { - var id; - var hasId = function(obj) { - return obj.id === id; - }; - - do { - id = prefix + index++; - } while (helpers.findIndex(axesOpts, hasId) >= 0); - - return id; -} - function positionIsHorizontal(position) { return position === 'top' || position === 'bottom'; } @@ -310,16 +298,8 @@ helpers.extend(Chart.prototype, /** @lends Chart */ { var scalesOptions = options.scales || {}; var scaleOptions = options.scale; - helpers.each(scalesOptions.xAxes, function(xAxisOptions, index) { - if (!xAxisOptions.id) { - xAxisOptions.id = nextAvailableScaleId(scalesOptions.xAxes, 'x-axis-', index); - } - }); - - helpers.each(scalesOptions.yAxes, function(yAxisOptions, index) { - if (!yAxisOptions.id) { - yAxisOptions.id = nextAvailableScaleId(scalesOptions.yAxes, 'y-axis-', index); - } + helpers.each(scalesOptions, function(axisOptions, axisID) { + axisOptions.id = axisID; }); if (scaleOptions) { @@ -342,24 +322,20 @@ helpers.extend(Chart.prototype, /** @lends Chart */ { if (options.scales) { items = items.concat( - (options.scales.xAxes || []).map(function(xAxisOptions) { - return {options: xAxisOptions, dtype: 'category', dposition: 'bottom'}; - }), - (options.scales.yAxes || []).map(function(yAxisOptions) { - return {options: yAxisOptions, dtype: 'linear', dposition: 'left'}; + Object.entries(options.scales).map(function(entry) { + var axisID = entry[0]; + var axisOptions = entry[1]; + var isRadial = axisID.charAt(0).toLowerCase === 'r'; + var isHorizontal = axisID.charAt(0).toLowerCase() === 'x'; + return { + options: axisOptions, + dposition: isRadial ? 'chartArea' : isHorizontal ? 'bottom' : 'left', + dtype: isRadial ? 'radialLinear' : isHorizontal ? 'category' : 'linear' + }; }) ); } - if (options.scale) { - items.push({ - options: options.scale, - dtype: 'radialLinear', - isDefault: true, - dposition: 'chartArea' - }); - } - helpers.each(items, function(item) { var scaleOptions = item.options; var id = scaleOptions.id; @@ -391,6 +367,8 @@ helpers.extend(Chart.prototype, /** @lends Chart */ { scales[scale.id] = scale; } + scale.axis = scale.options.position === 'chartArea' ? 'r' : scale.isHorizontal() ? 'x' : 'y'; + // parse min/max value, so we can properly determine min/max for other scales scale._userMin = scale._parse(scale.options.min); scale._userMax = scale._parse(scale.options.max);
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
src/core/core.datasetController.js
@@ -175,15 +175,6 @@ function getStackKey(indexScale, valueScale, meta) { return indexScale.id + '.' + valueScale.id + '.' + meta.stack + '.' + meta.type; } -function getFirstScaleId(chart, axis) { - var scalesOpts = chart.options.scales; - var scale = chart.options.scale; - var scaleId = scale && scale.id; - var prop = axis + 'Axes'; - - return (scalesOpts && scalesOpts[prop] && scalesOpts[prop].length && scalesOpts[prop][0].id) || scaleId; -} - function getUserBounds(scale) { var {min, max, minDefined, maxDefined} = scale._getUserBounds(); return { @@ -230,6 +221,13 @@ function updateStacks(controller, parsed) { } } +function getFirstScaleId(chart, axis) { + const scales = chart.scales; + return Object.keys(scales).filter(key => { + return scales[key].axis === axis; + }).shift(); +} + // Base class for all dataset controllers (line, bar, etc) var DatasetController = function(chart, datasetIndex) { this.initialize(chart, datasetIndex); @@ -300,10 +298,13 @@ helpers.extend(DatasetController.prototype, { const chart = me.chart; const meta = me._cachedMeta; const dataset = me.getDataset(); + const xid = meta.xAxisID = dataset.xAxisID || getFirstScaleId(chart, 'x'); const yid = meta.yAxisID = dataset.yAxisID || getFirstScaleId(chart, 'y'); + const rid = meta.rAxisID = dataset.rAxisID || getFirstScaleId(chart, 'r'); meta.xScale = me.getScaleForId(xid); meta.yScale = me.getScaleForId(yid); + meta.rScale = me.getScaleForId(rid); meta.iScale = me._getIndexScale(); meta.vScale = me._getValueScale(); },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
src/core/core.scale.js
@@ -1388,13 +1388,6 @@ class Scale extends Element { }]; } - /** - * @private - */ - _getAxis() { - return this.isHorizontal() ? 'x' : 'y'; - } - /** * Returns visible dataset metas that are attached to this scale * @param {string} [type] - if specified, also filter by dataset type @@ -1403,7 +1396,7 @@ class Scale extends Element { _getMatchingVisibleMetas(type) { var me = this; var metas = me.chart._getSortedVisibleDatasetMetas(); - var axisID = me._getAxis() + 'AxisID'; + var axisID = me.axis + 'AxisID'; var result = []; var i, ilen, meta;
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
src/plugins/plugin.filler.js
@@ -428,7 +428,7 @@ module.exports = { visible: chart.isDatasetVisible(i), fill: decodeFill(el, i, count), chart: chart, - scale: meta.controller.getScaleForId(meta.yAxisID) || chart.scale, + scale: meta.yScale || meta.rScale, el: el }; }
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/backgroundColor/indexable.js
@@ -38,8 +38,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/backgroundColor/scriptable.js
@@ -36,13 +36,11 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [ - { - display: false, - beginAtZero: true - } - ] + x: {display: false}, + y: { + display: false, + beginAtZero: true + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/backgroundColor/value.js
@@ -24,8 +24,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-absolute.json
@@ -16,7 +16,7 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "type": "time", "offset": true, "display": false, @@ -26,11 +26,11 @@ "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-flex-offset.json
@@ -16,7 +16,7 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "type": "time", "offset": true, "display": false, @@ -26,11 +26,11 @@ "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-flex-single-reverse.json
@@ -16,21 +16,22 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "type": "time", "display": false, + "offset": false, "time": { "parser": "YYYY" }, "reverse": true, "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-flex-single.json
@@ -16,20 +16,21 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "type": "time", "display": false, + "offset": false, "time": { "parser": "YYYY" }, "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-flex.json
@@ -16,20 +16,21 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "type": "time", "display": false, + "offset": false, "time": { "parser": "YYYY" }, "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-max.json
@@ -16,20 +16,21 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "type": "time", "display": false, + "offset": false, "time": { "parser": "YYYY" }, "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-min-interval.json
@@ -15,20 +15,21 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "type": "time", "display": false, + "offset": false, "time": { "parser": "YYYY" }, "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-multiple.json
@@ -25,20 +25,21 @@ } }, "scales": { - "xAxes": [{ + "x": { "type": "time", "display": false, + "offset": false, "time": { "parser": "YYYY" }, "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-no-overlap.json
@@ -25,20 +25,21 @@ } }, "scales": { - "xAxes": [{ + "x": { "type": "time", "display": false, + "offset": false, "time": { "parser": "YYYY-MM" }, "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-offset.json
@@ -25,7 +25,7 @@ } }, "scales": { - "xAxes": [{ + "x": { "type": "time", "offset": true, "display": false, @@ -35,11 +35,11 @@ "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-per-dataset-stacked.json
@@ -24,7 +24,7 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "type": "time", "offset": true, "stacked": true, @@ -35,12 +35,12 @@ "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "stacked": true, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-per-dataset.json
@@ -19,7 +19,7 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "type": "time", "offset": true, "display": false, @@ -29,11 +29,11 @@ "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-reverse.json
@@ -25,21 +25,22 @@ } }, "scales": { - "xAxes": [{ + "x": { "type": "time", "display": false, + "offset": false, "time": { "parser": "YYYY" }, "reverse": true, "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-single-xy.json
@@ -15,20 +15,21 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "type": "time", "display": false, + "offset": false, "time": { "parser": "YYYY" }, "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-single.json
@@ -15,21 +15,22 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "type": "time", "display": false, + "offset": false, "time": { "parser": "YYYY" }, "min": "2013", "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/bar-thickness-stacked.json
@@ -25,22 +25,23 @@ } }, "scales": { - "xAxes": [{ + "x": { "type": "time", "stacked": true, "display": false, + "offset": false, "time": { "parser": "YYYY" }, "ticks": { "source": "labels" } - }], - "yAxes": [{ + }, + "y": { "display": false, "stacked": true, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderColor/indexable.js
@@ -40,8 +40,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderColor/scriptable.js
@@ -38,13 +38,11 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [ - { - display: false, - beginAtZero: true - } - ] + x: {display: false}, + y: { + display: false, + beginAtZero: true + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderColor/value.js
@@ -26,8 +26,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderSkipped/indexable.js
@@ -41,8 +41,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderSkipped/scriptable.js
@@ -39,13 +39,11 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [ - { - display: false, - beginAtZero: true - } - ] + x: {display: false}, + y: { + display: false, + beginAtZero: true + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderSkipped/value.js
@@ -42,8 +42,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderWidth/indexable-object.js
@@ -42,8 +42,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderWidth/indexable.js
@@ -40,8 +40,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderWidth/negative.js
@@ -35,8 +35,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderWidth/object.js
@@ -28,8 +28,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderWidth/scriptable-object.js
@@ -33,13 +33,11 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [ - { - display: false, - beginAtZero: true - } - ] + x: {display: false}, + y: { + display: false, + beginAtZero: true + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderWidth/scriptable.js
@@ -31,13 +31,11 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [ - { - display: false, - beginAtZero: true - } - ] + x: {display: false}, + y: { + display: false, + beginAtZero: true + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/borderWidth/value.js
@@ -26,8 +26,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/chart-area-clip.js
@@ -28,8 +28,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false, min: -10, max: 10}] + x: {display: false}, + y: {display: false, min: -10, max: 10} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/data/object.js
@@ -18,8 +18,8 @@ module.exports = { legend: false, title: false, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/floatBar/data-as-objects-horizontal.js
@@ -18,8 +18,8 @@ module.exports = { legend: false, title: false, scales: { - xAxes: [{display: false, min: 0}], - yAxes: [{display: false, stacked: true}] + x: {display: false, min: 0}, + y: {display: false, stacked: true} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/floatBar/data-as-objects.js
@@ -18,8 +18,8 @@ module.exports = { legend: false, title: false, scales: { - xAxes: [{display: false, stacked: true}], - yAxes: [{display: false, min: 0}] + x: {display: false, stacked: true}, + y: {display: false, min: 0} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/floatBar/float-bar-horizontal.json
@@ -18,14 +18,14 @@ "title": false, "legend": false, "scales": { - "xAxes": [{ + "x": { "display": false, "min": -8, "max": 12 - }], - "yAxes": [{ + }, + "y": { "display": false - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/floatBar/float-bar-stacked-horizontal.json
@@ -18,16 +18,16 @@ "title": false, "legend": false, "scales": { - "xAxes": [{ + "x": { "display": false, "stacked": true - }], - "yAxes": [{ + }, + "y": { "display": false, "stacked": true, "min": -8, "max": 12 - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/floatBar/float-bar-stacked.json
@@ -18,16 +18,16 @@ "title": false, "legend": false, "scales": { - "xAxes": [{ + "x": { "display": false, "stacked": true, "min": -8, "max": 12 - }], - "yAxes": [{ + }, + "y": { "display": false, "stacked": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/floatBar/float-bar.json
@@ -18,14 +18,14 @@ "title": false, "legend": false, "scales": { - "xAxes": [{ + "x": { "display": false, "min": -8, "max": 12 - }], - "yAxes": [{ + }, + "y": { "display": false - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/horizontal-borders.js
@@ -28,8 +28,8 @@ module.exports = { } }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/stacking/order-default.json
@@ -19,15 +19,15 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "display": false, "stacked": true - }], - "yAxes": [{ + }, + "y": { "display": false, "stacked": true, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bar/stacking/order-specified.json
@@ -22,15 +22,15 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "display": false, "stacked": true - }], - "yAxes": [{ + }, + "y": { "display": false, "stacked": true, "beginAtZero": true - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bubble/clip.js
@@ -14,15 +14,15 @@ module.exports = { options: { legend: false, scales: { - xAxes: [{ticks: {display: false}}], - yAxes: [{ + x: {ticks: {display: false}}, + y: { min: 8, max: 25, beginAtZero: true, ticks: { display: false } - }] + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bubble/point-style.json
@@ -93,12 +93,12 @@ "legend": false, "title": false, "scales": { - "xAxes": [{"display": false}], - "yAxes": [{ + "x": {"display": false}, + "y": { "display": false, "min": 0, "max": 4 - }] + } }, "elements": { "line": {
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bubble/radius-data.js
@@ -21,8 +21,8 @@ module.exports = { legend: false, title: false, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} }, elements: { point: {
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.bubble/radius-scriptable.js
@@ -20,8 +20,8 @@ module.exports = { legend: false, title: false, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} }, elements: { point: {
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/backgroundColor/scriptable.js
@@ -41,13 +41,11 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [ - { - display: false, - beginAtZero: true - } - ] + x: {display: false}, + y: { + display: false, + beginAtZero: true + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/backgroundColor/value.js
@@ -30,8 +30,8 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderCapStyle/scriptable.js
@@ -47,13 +47,11 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [ - { - display: false, - beginAtZero: true - } - ] + x: {display: false}, + y: { + display: false, + beginAtZero: true + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderCapStyle/value.js
@@ -38,8 +38,8 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderColor/scriptable.js
@@ -44,13 +44,11 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [ - { - display: false, - beginAtZero: true - } - ] + x: {display: false}, + y: { + display: false, + beginAtZero: true + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderColor/value.js
@@ -32,8 +32,8 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderDash/scriptable.js
@@ -35,13 +35,11 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [ - { - display: false, - beginAtZero: true - } - ] + x: {display: false}, + y: { + display: false, + beginAtZero: true + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderDash/value.js
@@ -33,8 +33,8 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderDashOffset/scriptable.js
@@ -39,8 +39,8 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderDashOffset/value.js
@@ -35,8 +35,8 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderJoinStyle/scriptable.js
@@ -47,8 +47,8 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderJoinStyle/value.js
@@ -38,8 +38,8 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderWidth/scriptable.js
@@ -42,13 +42,11 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [ - { - display: false, - beginAtZero: true - } - ] + x: {display: false}, + y: { + display: false, + beginAtZero: true + } } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/borderWidth/value.js
@@ -33,8 +33,8 @@ module.exports = { padding: 32 }, scales: { - xAxes: [{display: false}], - yAxes: [{display: false}] + x: {display: false}, + y: {display: false} } } },
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/clip/default-x-max.json
@@ -16,13 +16,13 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "max": 3, "ticks": { "display": false } - }], - "yAxes": [{"ticks": {"display": false}}] + }, + "y": {"ticks": {"display": false}} }, "layout": { "padding": 24
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/clip/default-x-min.json
@@ -16,13 +16,13 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "min": -2, "ticks": { "display": false } - }], - "yAxes": [{"ticks": {"display": false}}] + }, + "y": {"ticks": {"display": false}} }, "layout": { "padding": 24
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/clip/default-x.json
@@ -16,14 +16,14 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "min": -2, "max": 3, "ticks": { "display": false } - }], - "yAxes": [{"ticks": {"display": false}}] + }, + "y": {"ticks": {"display": false}} }, "layout": { "padding": 24
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/clip/default-y-max.json
@@ -16,13 +16,13 @@ "legend": false, "title": false, "scales": { - "xAxes": [{"ticks": {"display": false}}], - "yAxes": [{ + "x": {"ticks": {"display": false}}, + "y": { "max": 6, "ticks": { "display": false } - }] + } }, "layout": { "padding": 24
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/clip/default-y-min.json
@@ -16,13 +16,13 @@ "legend": false, "title": false, "scales": { - "xAxes": [{"ticks": {"display": false}}], - "yAxes": [{ + "x": {"ticks": {"display": false}}, + "y": { "min": 2, "ticks": { "display": false } - }] + } }, "layout": { "padding": 24
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/clip/default-y.json
@@ -16,14 +16,14 @@ "legend": false, "title": false, "scales": { - "xAxes": [{"ticks": {"display": false}}], - "yAxes": [{ + "x": {"ticks": {"display": false}}, + "y": { "min": 2, "max": 6, "ticks": { "display": false } - }] + } }, "layout": { "padding": 24
true
Other
chartjs
Chart.js
ce74eb76a1ad29c0ccaeb8cf3e606d82e38f2ac7.json
Convert axis options from arrays to objects (#6773) * Convert axis options from arrays to objects * Updated all chart type defaults * Throw errors when axis type or position are not specified * Avoid raising unnecessary errors when merging options into the default configs * Fix additional tests * Ensure scale defaults are set if type is not explicitly defined * Another step * Include `scale` as `firstIDs.r` * update docs * Update for buildOrUpdateScales * Update migration guide * Add test back
test/fixtures/controller.line/clip/specified.json
@@ -39,20 +39,20 @@ "legend": false, "title": false, "scales": { - "xAxes": [{ + "x": { "min": -2, "max": 2, "ticks": { "display": false } - }], - "yAxes": [{ + }, + "y": { "min": -2, "max": 2, "ticks": { "display": false } - }] + } }, "layout": { "padding": 24
true