From 5010de9f960f574d36c702b3097260035dddde30 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Sat, 26 May 2018 14:49:36 +0200
Subject: [PATCH] Refactor components

---
 src/dom_components/model/ComponentMap.js      | 9 +++++----
 src/dom_components/model/ComponentScript.js   | 7 ++++---
 src/dom_components/model/ComponentSvg.js      | 2 +-
 src/dom_components/model/ComponentTextNode.js | 7 ++++---
 src/dom_components/model/Toolbar.js           | 4 ++--
 src/dom_components/model/ToolbarButton.js     | 2 +-
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/dom_components/model/ComponentMap.js b/src/dom_components/model/ComponentMap.js
index 704ab6d20..46158bb93 100644
--- a/src/dom_components/model/ComponentMap.js
+++ b/src/dom_components/model/ComponentMap.js
@@ -1,9 +1,10 @@
-var Component = require('./ComponentImage');
-var OComponent = require('./Component');
+const Component = require('./ComponentImage');
+const OComponent = require('./Component');
 
 module.exports = Component.extend(
   {
-    defaults: _.extend({}, Component.prototype.defaults, {
+    defaults: {
+      ...Component.prototype.defaults,
       type: 'map',
       void: 0,
       mapUrl: 'https://maps.google.com/maps',
@@ -39,7 +40,7 @@ module.exports = Component.extend(
           changeProp: 1
         }
       ]
-    }),
+    },
 
     initialize(o, opt) {
       if (this.get('src')) this.parseFromSrc();
diff --git a/src/dom_components/model/ComponentScript.js b/src/dom_components/model/ComponentScript.js
index b3b1bde4c..84707d0d3 100644
--- a/src/dom_components/model/ComponentScript.js
+++ b/src/dom_components/model/ComponentScript.js
@@ -1,13 +1,14 @@
-var Component = require('./Component');
+const Component = require('./Component');
 
 module.exports = Component.extend(
   {
-    defaults: _.extend({}, Component.prototype.defaults, {
+    defaults: {
+      ...Component.prototype.defaults,
       type: 'script',
       droppable: false,
       draggable: false,
       layerable: false
-    })
+    }
   },
   {
     isComponent(el) {
diff --git a/src/dom_components/model/ComponentSvg.js b/src/dom_components/model/ComponentSvg.js
index db5b2c058..11aa37b41 100644
--- a/src/dom_components/model/ComponentSvg.js
+++ b/src/dom_components/model/ComponentSvg.js
@@ -1,4 +1,4 @@
-var Component = require('./Component');
+const Component = require('./Component');
 
 module.exports = Component.extend(
   {
diff --git a/src/dom_components/model/ComponentTextNode.js b/src/dom_components/model/ComponentTextNode.js
index 3328c3365..c1fcc28c8 100644
--- a/src/dom_components/model/ComponentTextNode.js
+++ b/src/dom_components/model/ComponentTextNode.js
@@ -1,11 +1,12 @@
-var Component = require('./Component');
+const Component = require('./Component');
 
 module.exports = Component.extend(
   {
-    defaults: _.extend({}, Component.prototype.defaults, {
+    defaults: {
+      ...Component.prototype.defaults,
       droppable: false,
       editable: true
-    }),
+    },
 
     toHTML() {
       return this.get('content');
diff --git a/src/dom_components/model/Toolbar.js b/src/dom_components/model/Toolbar.js
index 94367142f..3d6689c6c 100644
--- a/src/dom_components/model/Toolbar.js
+++ b/src/dom_components/model/Toolbar.js
@@ -1,4 +1,4 @@
-var Backbone = require('backbone');
-var ToolbarButton = require('./ToolbarButton');
+const Backbone = require('backbone');
+const ToolbarButton = require('./ToolbarButton');
 
 module.exports = Backbone.Collection.extend({ model: ToolbarButton });
diff --git a/src/dom_components/model/ToolbarButton.js b/src/dom_components/model/ToolbarButton.js
index b4145ed05..9e93edb3f 100644
--- a/src/dom_components/model/ToolbarButton.js
+++ b/src/dom_components/model/ToolbarButton.js
@@ -1,4 +1,4 @@
-var Backbone = require('backbone');
+const Backbone = require('backbone');
 
 module.exports = Backbone.Model.extend({
   defaults: {