Skip to content

Commit

Permalink
Replace helpers.extend with Object.assign when available or use helpe…
Browse files Browse the repository at this point in the history
…rs.merge (chartjs#6148)
  • Loading branch information
kurkle authored and simonbrunel committed Mar 19, 2019
1 parent 4dd0c3b commit b7565e6
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions src/helpers/helpers.core.js
Expand Up @@ -275,14 +275,12 @@ var helpers = {
* @param {object} argN - Additional objects containing properties to merge in target.
* @returns {object} The `target` object.
*/
extend: function(target) {
var setFn = function(value, key) {
target[key] = value;
};
for (var i = 1, ilen = arguments.length; i < ilen; ++i) {
helpers.each(arguments[i], setFn);
}
return target;
extend: Object.assign || function(target) {
return helpers.merge(target, [].slice.call(arguments, 1), {
merger: function(key, dst, src) {
dst[key] = src[key];
}
});
},

/**
Expand Down

0 comments on commit b7565e6

Please sign in to comment.