From 484b31b9b9b66f058cfd3858787e1ef6abda39cb Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Wed, 15 Nov 2017 22:40:54 +0100 Subject: [PATCH] Remove `Object.assign`s --- src/asset_manager/model/AssetImage.js | 4 ++-- src/commands/view/SelectComponent.js | 2 +- src/css_composer/index.js | 3 +-- src/dom_components/index.js | 4 ++-- src/style_manager/model/Layers.js | 4 ++-- src/style_manager/model/Properties.js | 2 +- src/style_manager/model/PropertyComposite.js | 4 ++-- src/style_manager/model/PropertyRadio.js | 4 ++-- src/style_manager/model/PropertyStack.js | 4 ++-- src/style_manager/view/PropertyColorView.js | 2 +- test/specs/style_manager/view/PropertyColorView.js | 2 +- test/specs/style_manager/view/PropertyIntegerView.js | 2 +- test/specs/style_manager/view/PropertyRadioView.js | 2 +- test/specs/style_manager/view/PropertySelectView.js | 2 +- test/specs/style_manager/view/PropertyView.js | 2 +- 15 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/asset_manager/model/AssetImage.js b/src/asset_manager/model/AssetImage.js index c4d11ac37..f43bd092d 100644 --- a/src/asset_manager/model/AssetImage.js +++ b/src/asset_manager/model/AssetImage.js @@ -2,11 +2,11 @@ const Asset = require('./Asset'); module.exports = Asset.extend({ - defaults: Object.assign({}, Asset.prototype.defaults, { + defaults: { ...Asset.prototype.defaults, type: 'image', unitDim: 'px', height: 0, width: 0, - }), + }, }); diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js index 41cceb1ae..10cc05ba5 100644 --- a/src/commands/view/SelectComponent.js +++ b/src/commands/view/SelectComponent.js @@ -401,7 +401,7 @@ module.exports = { }; if (typeof resizable == 'object') { - options = Object.assign(options, resizable); + options = { ...options, ...resizable }; } editor.runCommand('resize', {el, options}); diff --git a/src/css_composer/index.js b/src/css_composer/index.js index 52faf5402..03a4e9b94 100644 --- a/src/css_composer/index.js +++ b/src/css_composer/index.js @@ -265,8 +265,7 @@ module.exports = () => { const style = rule.style || {}; if (updateStyle) { - let styleUpdate = opts.extend ? - Object.assign({}, model.get('style'), style) : style; + let styleUpdate = opts.extend ? { ...model.get('style'), ...style } : style; model.set('style', styleUpdate); } diff --git a/src/dom_components/index.js b/src/dom_components/index.js index c397eff90..83509a6f4 100644 --- a/src/dom_components/index.js +++ b/src/dom_components/index.js @@ -176,13 +176,13 @@ module.exports = () => { // Build wrapper let components = c.components; - let wrapper = Object.assign({}, c.wrapper); + let wrapper = { ...c.wrapper }; wrapper['custom-name'] = c.wrapperName; wrapper.wrapper = 1; // Components might be a wrapper if (components && components.constructor === Object && components.wrapper) { - wrapper = Object.assign({}, components); + wrapper = { ...components }; components = components.components || []; wrapper.components = []; diff --git a/src/style_manager/model/Layers.js b/src/style_manager/model/Layers.js index a02816cf1..c1fc0b9bd 100644 --- a/src/style_manager/model/Layers.js +++ b/src/style_manager/model/Layers.js @@ -66,7 +66,7 @@ module.exports = Backbone.Collection.extend({ values.forEach((value, i) => { value = propModel.parseValue(value.trim()).value; const layer = layers[i]; - const propertyObj = Object.assign({}, propModel.attributes, {value}); + const propertyObj = { ...propModel.attributes, ...{ value } }; if (layer) { layer.properties.push(propertyObj); @@ -85,7 +85,7 @@ module.exports = Backbone.Collection.extend({ const propertyName = propModel.get('property'); if (layerProprs.indexOf(propertyName) < 0) { - layer.properties.push(Object.assign({}, propModel.attributes)) + layer.properties.push({ ...propModel.attributes }) } }) }); diff --git a/src/style_manager/model/Properties.js b/src/style_manager/model/Properties.js index 05ad5eea1..c2d4471ae 100644 --- a/src/style_manager/model/Properties.js +++ b/src/style_manager/model/Properties.js @@ -107,7 +107,7 @@ module.exports = require('backbone').Collection.extend(TypeableCollection).exten const values = value.split(' '); values.forEach((value, i) => { const property = this.at(i); - properties.push(Object.assign({}, property.attributes, {value})); + properties.push({ ...property.attributes, ...{ value } }); }); return properties; }, diff --git a/src/style_manager/model/PropertyComposite.js b/src/style_manager/model/PropertyComposite.js index 0022e5535..069ecfb79 100644 --- a/src/style_manager/model/PropertyComposite.js +++ b/src/style_manager/model/PropertyComposite.js @@ -2,7 +2,7 @@ const Property = require('./Property'); module.exports = Property.extend({ - defaults: Object.assign({}, Property.prototype.defaults, { + defaults: { ...Property.prototype.defaults, // 'background' is a good example where to make a difference // between detached and not // @@ -19,7 +19,7 @@ module.exports = Property.extend({ // Separator between properties separator: ' ', - }), + }, init() { diff --git a/src/style_manager/model/PropertyRadio.js b/src/style_manager/model/PropertyRadio.js index cb132dfdd..7c4631553 100644 --- a/src/style_manager/model/PropertyRadio.js +++ b/src/style_manager/model/PropertyRadio.js @@ -2,9 +2,9 @@ const Property = require('./Property'); module.exports = Property.extend({ - defaults: Object.assign({}, Property.prototype.defaults, { + defaults: { ...Property.prototype.defaults, // Array of options, eg. [{name: 'Label ', value: '100'}] options: [], - }), + }, }); diff --git a/src/style_manager/model/PropertyStack.js b/src/style_manager/model/PropertyStack.js index 9b6a8737e..86a4c7df8 100644 --- a/src/style_manager/model/PropertyStack.js +++ b/src/style_manager/model/PropertyStack.js @@ -3,13 +3,13 @@ const Layers = require('./Layers'); module.exports = Property.extend({ - defaults: Object.assign({}, Property.prototype.defaults, { + defaults: { ...Property.prototype.defaults, // Array of layers (which contain properties) layers: [], // Layer preview preview: 0, - }), + }, init() { Property.prototype.init.apply(this, arguments); diff --git a/src/style_manager/view/PropertyColorView.js b/src/style_manager/view/PropertyColorView.js index 7e61ee65d..6e8a870a5 100644 --- a/src/style_manager/view/PropertyColorView.js +++ b/src/style_manager/view/PropertyColorView.js @@ -3,7 +3,7 @@ const InputColor = require('domain_abstract/ui/InputColor'); module.exports = require('./PropertyIntegerView').extend({ setValue(value, opts = {}) { - opts = Object.assign({}, opts, {silent: 1}); + opts = { ...opts, silent: 1 }; this.inputInst.setValue(value, opts); }, diff --git a/test/specs/style_manager/view/PropertyColorView.js b/test/specs/style_manager/view/PropertyColorView.js index 5f543bbf2..83dac5e83 100644 --- a/test/specs/style_manager/view/PropertyColorView.js +++ b/test/specs/style_manager/view/PropertyColorView.js @@ -30,7 +30,7 @@ module.exports = { em = new Editor({}); dcomp = new DomComponents(); compOpts = { em, componentTypes: dcomp.componentTypes }; - propTarget = Object.assign({}, Backbone.Events); + propTarget = { ...Backbone.Events }; target = new Component({}, compOpts); component = new Component({}, compOpts); model = new Property({ diff --git a/test/specs/style_manager/view/PropertyIntegerView.js b/test/specs/style_manager/view/PropertyIntegerView.js index c99138e8b..b39363694 100644 --- a/test/specs/style_manager/view/PropertyIntegerView.js +++ b/test/specs/style_manager/view/PropertyIntegerView.js @@ -33,7 +33,7 @@ module.exports = { em = new Editor({}); dcomp = new DomComponents(); compOpts = { em, componentTypes: dcomp.componentTypes }; - propTarget = Object.assign({}, Backbone.Events); + propTarget = { ...Backbone.Events }; target = new Component({}, compOpts); component = new Component({}, compOpts); model = new PropertyInteger({ diff --git a/test/specs/style_manager/view/PropertyRadioView.js b/test/specs/style_manager/view/PropertyRadioView.js index 9866b9bfe..5dc91b740 100644 --- a/test/specs/style_manager/view/PropertyRadioView.js +++ b/test/specs/style_manager/view/PropertyRadioView.js @@ -35,7 +35,7 @@ module.exports = { em = new Editor({}); dcomp = new DomComponents(); compOpts = { em, componentTypes: dcomp.componentTypes }; - propTarget = Object.assign({}, Backbone.Events); + propTarget = { ...Backbone.Events }; target = new Component({}, compOpts); component = new Component({}, compOpts); model = new Property({ diff --git a/test/specs/style_manager/view/PropertySelectView.js b/test/specs/style_manager/view/PropertySelectView.js index 37c3ac44c..c44d07834 100644 --- a/test/specs/style_manager/view/PropertySelectView.js +++ b/test/specs/style_manager/view/PropertySelectView.js @@ -31,7 +31,7 @@ module.exports = { em = new Editor({}); dcomp = new DomComponents(); compOpts = { em, componentTypes: dcomp.componentTypes }; - propTarget = Object.assign({}, Backbone.Events); + propTarget = { ...Backbone.Events }; target = new Component({}, compOpts); component = new Component({}, compOpts); model = new Property({ diff --git a/test/specs/style_manager/view/PropertyView.js b/test/specs/style_manager/view/PropertyView.js index 3757f4ba5..d7ad72573 100644 --- a/test/specs/style_manager/view/PropertyView.js +++ b/test/specs/style_manager/view/PropertyView.js @@ -27,7 +27,7 @@ module.exports = { em = new Editor({}); dcomp = new DomComponents(); compOpts = { em, componentTypes: dcomp.componentTypes }; - propTarget = Object.assign({}, Backbone.Events); + propTarget = { ...Backbone.Events }; target = new Component({}, compOpts); component = new Component({}, compOpts); model = new Property({property: propName});