Skip to content

Commit

Permalink
Merge 940291b into 6816da8
Browse files Browse the repository at this point in the history
  • Loading branch information
aarranz committed May 13, 2020
2 parents 6816da8 + 940291b commit 1024ecd
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions src/wirecloud/commons/static/js/StyledElements/Utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,8 @@ if (window.StyledElements == null) {
* property assignments of previous sources.
*
* @memberof StyledElements.Utils
* @deprecated since version 0.11.0
* @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign | Object.assign} as replacement
* @since 0.5
*
* @param {Object} object The destination object.
Expand Down Expand Up @@ -846,22 +848,7 @@ if (window.StyledElements == null) {
* defaults;
* => {depth: 0, state: "primary", events: ["mouseover"]}
*/
Utils.merge = function merge(object) {

if (object == null || typeof object !== "object") {
throw new TypeError("object argument must be an object");
}

Array.prototype.slice.call(arguments, 1).forEach(function (source) {
if (source != null) {
Object.keys(source).forEach(function (key) {
object[key] = source[key];
});
}
});

return object;
};
Utils.merge = Object.assign;

/**
* Updates existing properties using the values obtained from a list of
Expand Down

0 comments on commit 1024ecd

Please sign in to comment.