From a260dfc174ee7a06b238e711a579bc065f176a2a Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Tue, 19 Mar 2019 09:49:12 +0200 Subject: [PATCH 1/3] Use Object.assign as extend when available --- src/helpers/helpers.core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/helpers.core.js b/src/helpers/helpers.core.js index cc8d888e653..11526c6aa0c 100644 --- a/src/helpers/helpers.core.js +++ b/src/helpers/helpers.core.js @@ -275,7 +275,7 @@ var helpers = { * @param {object} argN - Additional objects containing properties to merge in target. * @returns {object} The `target` object. */ - extend: function(target) { + extend: Object.assing ? Object.assign : function(target) { var setFn = function(value, key) { target[key] = value; }; From e83b919a13cfba510de2a7788bb368dcae3a632b Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Tue, 19 Mar 2019 10:53:55 +0200 Subject: [PATCH 2/3] Use merge as fallback --- src/helpers/helpers.core.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/helpers/helpers.core.js b/src/helpers/helpers.core.js index 11526c6aa0c..201337fa8fb 100644 --- a/src/helpers/helpers.core.js +++ b/src/helpers/helpers.core.js @@ -275,14 +275,12 @@ var helpers = { * @param {object} argN - Additional objects containing properties to merge in target. * @returns {object} The `target` object. */ - extend: Object.assing ? Object.assign : 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() { + return helpers.merge(arguments[0], [].slice.call(arguments, 1), { + merger: function(key, target, source) { + target[key] = source[key]; + } + }); }, /** From cc19ef59636d822ef8f00e6e98174d2f5b453ed3 Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Tue, 19 Mar 2019 11:00:12 +0200 Subject: [PATCH 3/3] Minimization NIT --- src/helpers/helpers.core.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/helpers/helpers.core.js b/src/helpers/helpers.core.js index 201337fa8fb..a97b2f7e814 100644 --- a/src/helpers/helpers.core.js +++ b/src/helpers/helpers.core.js @@ -275,10 +275,10 @@ var helpers = { * @param {object} argN - Additional objects containing properties to merge in target. * @returns {object} The `target` object. */ - extend: Object.assign || function() { - return helpers.merge(arguments[0], [].slice.call(arguments, 1), { - merger: function(key, target, source) { - target[key] = source[key]; + extend: Object.assign || function(target) { + return helpers.merge(target, [].slice.call(arguments, 1), { + merger: function(key, dst, src) { + dst[key] = src[key]; } }); },