]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Replace helpers.extend with Object.assign when available or use helpers.merge (#6148)
authorJukka Kurkela <jukka.kurkela@gmail.com>
Tue, 19 Mar 2019 12:25:45 +0000 (14:25 +0200)
committerSimon Brunel <simonbrunel@users.noreply.github.com>
Tue, 19 Mar 2019 12:25:45 +0000 (13:25 +0100)
src/helpers/helpers.core.js

index cc8d888e65335cf9c1705a3d3dc080fb2349da11..a97b2f7e81486919c9f9f92911ffa28451894b4a 100644 (file)
@@ -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];
+                       }
+               });
        },
 
        /**