Skip to content

Commit

Permalink
build patched version
Browse files Browse the repository at this point in the history
  • Loading branch information
GramParallelo committed Mar 23, 2022
1 parent d80ddf9 commit 3c7924e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions dist/Chart.bundle.js
Expand Up @@ -3832,7 +3832,7 @@ helpers$1.extend(DatasetController.prototype, {
*/
_configure: function() {
var me = this;
me._config = helpers$1.merge(Object.create(null), [
me._config = helpers$1.merge({}, [
me.chart.options.datasets[me._type],
me.getDataset(),
], {
Expand Down Expand Up @@ -8118,7 +8118,7 @@ var core_scaleService = {
},
getScaleDefaults: function(type) {
// Return the scale defaults merged with the global settings so that we always use the latest ones
return this.defaults.hasOwnProperty(type) ? helpers$1.merge(Object.create(null), [core_defaults.scale, this.defaults[type]]) : {};
return this.defaults.hasOwnProperty(type) ? helpers$1.merge({}, [core_defaults.scale, this.defaults[type]]) : {};
},
updateScaleDefaults: function(type, additions) {
var me = this;
Expand Down Expand Up @@ -9193,7 +9193,7 @@ core_defaults._set('global', {
* returns a deep copy of the result, thus doesn't alter inputs.
*/
function mergeScaleConfig(/* config objects ... */) {
return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
return helpers$1.merge({}, [].slice.call(arguments), {
merger: function(key, target, source, options) {
if (key === 'xAxes' || key === 'yAxes') {
var slen = source[key].length;
Expand Down Expand Up @@ -9233,9 +9233,9 @@ function mergeScaleConfig(/* config objects ... */) {
* a deep copy of the result, thus doesn't alter inputs.
*/
function mergeConfig(/* config objects ... */) {
return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
return helpers$1.merge({}, [].slice.call(arguments), {
merger: function(key, target, source, options) {
var tval = target[key] || Object.create(null);
var tval = target[key] || {};
var sval = source[key];

if (key === 'scales') {
Expand All @@ -9252,7 +9252,7 @@ function mergeConfig(/* config objects ... */) {
}

function initConfig(config) {
config = config || Object.create(null);
config = 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.
Expand Down
2 changes: 1 addition & 1 deletion dist/Chart.bundle.min.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions dist/Chart.js
Expand Up @@ -3828,7 +3828,7 @@ helpers$1.extend(DatasetController.prototype, {
*/
_configure: function() {
var me = this;
me._config = helpers$1.merge(Object.create(null), [
me._config = helpers$1.merge({}, [
me.chart.options.datasets[me._type],
me.getDataset(),
], {
Expand Down Expand Up @@ -8114,7 +8114,7 @@ var core_scaleService = {
},
getScaleDefaults: function(type) {
// Return the scale defaults merged with the global settings so that we always use the latest ones
return this.defaults.hasOwnProperty(type) ? helpers$1.merge(Object.create(null), [core_defaults.scale, this.defaults[type]]) : {};
return this.defaults.hasOwnProperty(type) ? helpers$1.merge({}, [core_defaults.scale, this.defaults[type]]) : {};
},
updateScaleDefaults: function(type, additions) {
var me = this;
Expand Down Expand Up @@ -9189,7 +9189,7 @@ core_defaults._set('global', {
* returns a deep copy of the result, thus doesn't alter inputs.
*/
function mergeScaleConfig(/* config objects ... */) {
return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
return helpers$1.merge({}, [].slice.call(arguments), {
merger: function(key, target, source, options) {
if (key === 'xAxes' || key === 'yAxes') {
var slen = source[key].length;
Expand Down Expand Up @@ -9229,9 +9229,9 @@ function mergeScaleConfig(/* config objects ... */) {
* a deep copy of the result, thus doesn't alter inputs.
*/
function mergeConfig(/* config objects ... */) {
return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
return helpers$1.merge({}, [].slice.call(arguments), {
merger: function(key, target, source, options) {
var tval = target[key] || Object.create(null);
var tval = target[key] || {};
var sval = source[key];

if (key === 'scales') {
Expand All @@ -9248,7 +9248,7 @@ function mergeConfig(/* config objects ... */) {
}

function initConfig(config) {
config = config || Object.create(null);
config = 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.
Expand Down
2 changes: 1 addition & 1 deletion dist/Chart.min.js

Large diffs are not rendered by default.

0 comments on commit 3c7924e

Please sign in to comment.