From 22e00c17dd5b63f363cfee4c5c07f283086bc3a4 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 22 Aug 2017 22:49:16 +0200
Subject: [PATCH] Update add method in plugin manager and return the plugin
 itself

---
 src/canvas/view/CanvasView.js      | 3 ++-
 src/editor/view/EditorView.js      | 3 +--
 src/modal_dialog/view/ModalView.js | 5 +----
 src/plugin_manager/index.js        | 8 +++++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js
index 6092aeea2..a95b553b7 100644
--- a/src/canvas/view/CanvasView.js
+++ b/src/canvas/view/CanvasView.js
@@ -64,7 +64,8 @@ module.exports = Backbone.View.extend({
     var em = this.config.em;
     if(wrap) {
       var ppfx = this.ppfx;
-      var body = this.frame.$el.contents().find('body');
+      //var body = this.frame.$el.contents().find('body');
+      var body = $(this.frame.el.contentWindow.document.body);
       var cssc = em.get('CssComposer');
       var conf = em.get('Config');
       var confCanvas = this.config;
diff --git a/src/editor/view/EditorView.js b/src/editor/view/EditorView.js
index 2e8e3bef2..62bf39723 100644
--- a/src/editor/view/EditorView.js
+++ b/src/editor/view/EditorView.js
@@ -47,9 +47,8 @@ module.exports = Backbone.View.extend({
     // Panels
     this.$el.append(this.pn.render());
     this.$el.attr('class', this.className);
-
     contEl.addClass(conf.stylePrefix + 'editor-cont');
-    contEl.html(this.$el);
+    contEl.empty().append(this.$el);
 
     return this;
   }
diff --git a/src/modal_dialog/view/ModalView.js b/src/modal_dialog/view/ModalView.js
index 9faf83b49..fd4732f11 100644
--- a/src/modal_dialog/view/ModalView.js
+++ b/src/modal_dialog/view/ModalView.js
@@ -89,10 +89,7 @@ module.exports = Backbone.View.extend({
    * @private
    * */
   updateOpen() {
-    if(this.model.get('open'))
-      this.$el.show();
-    else
-      this.$el.hide();
+    this.el.style.display = this.model.get('open') ? '' : 'none';
   },
 
   /**
diff --git a/src/plugin_manager/index.js b/src/plugin_manager/index.js
index 6c856cb4e..b78d70284 100644
--- a/src/plugin_manager/index.js
+++ b/src/plugin_manager/index.js
@@ -28,10 +28,12 @@ module.exports = config => {
      * });
      */
     add(id, plugin) {
-      if(plugins[id])
-        return this;
+      if (plugins[id]) {
+        return plugins[id];
+      }
+
       plugins[id] = plugin;
-      return this;
+      return plugin;
     },
 
     /**