Browse Source

Remove `Object.assign`s

pull/540/head
Artur Arseniev 9 years ago
parent
commit
484b31b9b9
  1. 4
      src/asset_manager/model/AssetImage.js
  2. 2
      src/commands/view/SelectComponent.js
  3. 3
      src/css_composer/index.js
  4. 4
      src/dom_components/index.js
  5. 4
      src/style_manager/model/Layers.js
  6. 2
      src/style_manager/model/Properties.js
  7. 4
      src/style_manager/model/PropertyComposite.js
  8. 4
      src/style_manager/model/PropertyRadio.js
  9. 4
      src/style_manager/model/PropertyStack.js
  10. 2
      src/style_manager/view/PropertyColorView.js
  11. 2
      test/specs/style_manager/view/PropertyColorView.js
  12. 2
      test/specs/style_manager/view/PropertyIntegerView.js
  13. 2
      test/specs/style_manager/view/PropertyRadioView.js
  14. 2
      test/specs/style_manager/view/PropertySelectView.js
  15. 2
      test/specs/style_manager/view/PropertyView.js

4
src/asset_manager/model/AssetImage.js

@ -2,11 +2,11 @@ const Asset = require('./Asset');
module.exports = Asset.extend({ module.exports = Asset.extend({
defaults: Object.assign({}, Asset.prototype.defaults, { defaults: { ...Asset.prototype.defaults,
type: 'image', type: 'image',
unitDim: 'px', unitDim: 'px',
height: 0, height: 0,
width: 0, width: 0,
}), },
}); });

2
src/commands/view/SelectComponent.js

@ -401,7 +401,7 @@ module.exports = {
}; };
if (typeof resizable == 'object') { if (typeof resizable == 'object') {
options = Object.assign(options, resizable); options = { ...options, ...resizable };
} }
editor.runCommand('resize', {el, options}); editor.runCommand('resize', {el, options});

3
src/css_composer/index.js

@ -265,8 +265,7 @@ module.exports = () => {
const style = rule.style || {}; const style = rule.style || {};
if (updateStyle) { if (updateStyle) {
let styleUpdate = opts.extend ? let styleUpdate = opts.extend ? { ...model.get('style'), ...style } : style;
Object.assign({}, model.get('style'), style) : style;
model.set('style', styleUpdate); model.set('style', styleUpdate);
} }

4
src/dom_components/index.js

@ -176,13 +176,13 @@ module.exports = () => {
// Build wrapper // Build wrapper
let components = c.components; let components = c.components;
let wrapper = Object.assign({}, c.wrapper); let wrapper = { ...c.wrapper };
wrapper['custom-name'] = c.wrapperName; wrapper['custom-name'] = c.wrapperName;
wrapper.wrapper = 1; wrapper.wrapper = 1;
// Components might be a wrapper // Components might be a wrapper
if (components && components.constructor === Object && components.wrapper) { if (components && components.constructor === Object && components.wrapper) {
wrapper = Object.assign({}, components); wrapper = { ...components };
components = components.components || []; components = components.components || [];
wrapper.components = []; wrapper.components = [];

4
src/style_manager/model/Layers.js

@ -66,7 +66,7 @@ module.exports = Backbone.Collection.extend({
values.forEach((value, i) => { values.forEach((value, i) => {
value = propModel.parseValue(value.trim()).value; value = propModel.parseValue(value.trim()).value;
const layer = layers[i]; const layer = layers[i];
const propertyObj = Object.assign({}, propModel.attributes, {value}); const propertyObj = { ...propModel.attributes, ...{ value } };
if (layer) { if (layer) {
layer.properties.push(propertyObj); layer.properties.push(propertyObj);
@ -85,7 +85,7 @@ module.exports = Backbone.Collection.extend({
const propertyName = propModel.get('property'); const propertyName = propModel.get('property');
if (layerProprs.indexOf(propertyName) < 0) { if (layerProprs.indexOf(propertyName) < 0) {
layer.properties.push(Object.assign({}, propModel.attributes)) layer.properties.push({ ...propModel.attributes })
} }
}) })
}); });

2
src/style_manager/model/Properties.js

@ -107,7 +107,7 @@ module.exports = require('backbone').Collection.extend(TypeableCollection).exten
const values = value.split(' '); const values = value.split(' ');
values.forEach((value, i) => { values.forEach((value, i) => {
const property = this.at(i); const property = this.at(i);
properties.push(Object.assign({}, property.attributes, {value})); properties.push({ ...property.attributes, ...{ value } });
}); });
return properties; return properties;
}, },

4
src/style_manager/model/PropertyComposite.js

@ -2,7 +2,7 @@ const Property = require('./Property');
module.exports = Property.extend({ module.exports = Property.extend({
defaults: Object.assign({}, Property.prototype.defaults, { defaults: { ...Property.prototype.defaults,
// 'background' is a good example where to make a difference // 'background' is a good example where to make a difference
// between detached and not // between detached and not
// //
@ -19,7 +19,7 @@ module.exports = Property.extend({
// Separator between properties // Separator between properties
separator: ' ', separator: ' ',
}), },
init() { init() {

4
src/style_manager/model/PropertyRadio.js

@ -2,9 +2,9 @@ const Property = require('./Property');
module.exports = Property.extend({ module.exports = Property.extend({
defaults: Object.assign({}, Property.prototype.defaults, { defaults: { ...Property.prototype.defaults,
// Array of options, eg. [{name: 'Label ', value: '100'}] // Array of options, eg. [{name: 'Label ', value: '100'}]
options: [], options: [],
}), },
}); });

4
src/style_manager/model/PropertyStack.js

@ -3,13 +3,13 @@ const Layers = require('./Layers');
module.exports = Property.extend({ module.exports = Property.extend({
defaults: Object.assign({}, Property.prototype.defaults, { defaults: { ...Property.prototype.defaults,
// Array of layers (which contain properties) // Array of layers (which contain properties)
layers: [], layers: [],
// Layer preview // Layer preview
preview: 0, preview: 0,
}), },
init() { init() {
Property.prototype.init.apply(this, arguments); Property.prototype.init.apply(this, arguments);

2
src/style_manager/view/PropertyColorView.js

@ -3,7 +3,7 @@ const InputColor = require('domain_abstract/ui/InputColor');
module.exports = require('./PropertyIntegerView').extend({ module.exports = require('./PropertyIntegerView').extend({
setValue(value, opts = {}) { setValue(value, opts = {}) {
opts = Object.assign({}, opts, {silent: 1}); opts = { ...opts, silent: 1 };
this.inputInst.setValue(value, opts); this.inputInst.setValue(value, opts);
}, },

2
test/specs/style_manager/view/PropertyColorView.js

@ -30,7 +30,7 @@ module.exports = {
em = new Editor({}); em = new Editor({});
dcomp = new DomComponents(); dcomp = new DomComponents();
compOpts = { em, componentTypes: dcomp.componentTypes }; compOpts = { em, componentTypes: dcomp.componentTypes };
propTarget = Object.assign({}, Backbone.Events); propTarget = { ...Backbone.Events };
target = new Component({}, compOpts); target = new Component({}, compOpts);
component = new Component({}, compOpts); component = new Component({}, compOpts);
model = new Property({ model = new Property({

2
test/specs/style_manager/view/PropertyIntegerView.js

@ -33,7 +33,7 @@ module.exports = {
em = new Editor({}); em = new Editor({});
dcomp = new DomComponents(); dcomp = new DomComponents();
compOpts = { em, componentTypes: dcomp.componentTypes }; compOpts = { em, componentTypes: dcomp.componentTypes };
propTarget = Object.assign({}, Backbone.Events); propTarget = { ...Backbone.Events };
target = new Component({}, compOpts); target = new Component({}, compOpts);
component = new Component({}, compOpts); component = new Component({}, compOpts);
model = new PropertyInteger({ model = new PropertyInteger({

2
test/specs/style_manager/view/PropertyRadioView.js

@ -35,7 +35,7 @@ module.exports = {
em = new Editor({}); em = new Editor({});
dcomp = new DomComponents(); dcomp = new DomComponents();
compOpts = { em, componentTypes: dcomp.componentTypes }; compOpts = { em, componentTypes: dcomp.componentTypes };
propTarget = Object.assign({}, Backbone.Events); propTarget = { ...Backbone.Events };
target = new Component({}, compOpts); target = new Component({}, compOpts);
component = new Component({}, compOpts); component = new Component({}, compOpts);
model = new Property({ model = new Property({

2
test/specs/style_manager/view/PropertySelectView.js

@ -31,7 +31,7 @@ module.exports = {
em = new Editor({}); em = new Editor({});
dcomp = new DomComponents(); dcomp = new DomComponents();
compOpts = { em, componentTypes: dcomp.componentTypes }; compOpts = { em, componentTypes: dcomp.componentTypes };
propTarget = Object.assign({}, Backbone.Events); propTarget = { ...Backbone.Events };
target = new Component({}, compOpts); target = new Component({}, compOpts);
component = new Component({}, compOpts); component = new Component({}, compOpts);
model = new Property({ model = new Property({

2
test/specs/style_manager/view/PropertyView.js

@ -27,7 +27,7 @@ module.exports = {
em = new Editor({}); em = new Editor({});
dcomp = new DomComponents(); dcomp = new DomComponents();
compOpts = { em, componentTypes: dcomp.componentTypes }; compOpts = { em, componentTypes: dcomp.componentTypes };
propTarget = Object.assign({}, Backbone.Events); propTarget = { ...Backbone.Events };
target = new Component({}, compOpts); target = new Component({}, compOpts);
component = new Component({}, compOpts); component = new Component({}, compOpts);
model = new Property({property: propName}); model = new Property({property: propName});

Loading…
Cancel
Save