From 3cfe9a9acc8e7fb8ebe0da0eb36d30f005bf01f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= <t.9b5as@gmail.com>
Date: Wed, 7 Oct 2015 13:19:19 +0300
Subject: [PATCH] Fix rendering of Posts settings

---
 .../blocks/automatedLatestContent.js           |  2 +-
 assets/js/src/newsletter_editor/blocks/base.js |  4 +++-
 .../js/src/newsletter_editor/blocks/posts.js   | 18 +-----------------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js b/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js
index 2dc0dca03b..92835732f9 100644
--- a/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js
+++ b/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js
@@ -61,7 +61,7 @@ define([
       };
     },
     initialize: function() {
-      base.BlockModel.prototype.initialize.apply(this);
+      base.BlockView.prototype.initialize.apply(this, arguments);
       this.fetchPosts();
       this.on('change:amount change:contentType change:terms change:inclusionType change:displayType change:titleFormat change:titlePosition change:titleAlignment change:titleIsLink change:imagePadded change:showAuthor change:authorPrecededBy change:showCategories change:categoriesPrecededBy change:readMoreType change:readMoreText change:sortBy change:showDivider', this._scheduleFetchPosts, this);
       this.listenTo(this.get('readMoreButton'), 'change', this._scheduleFetchPosts);
diff --git a/assets/js/src/newsletter_editor/blocks/base.js b/assets/js/src/newsletter_editor/blocks/base.js
index 3000d99922..3927c6c973 100644
--- a/assets/js/src/newsletter_editor/blocks/base.js
+++ b/assets/js/src/newsletter_editor/blocks/base.js
@@ -189,7 +189,6 @@ define([
       });
     },
     close: function(event) {
-      MailPoet.Modal.cancel();
       this.destroy();
     },
     changeField: function(field, event) {
@@ -211,6 +210,9 @@ define([
       }
       this.model.set(field, value);
     },
+    onBeforeDestroy: function() {
+      MailPoet.Modal.close();
+    },
   });
 
   Module.WidgetView = Marionette.ItemView.extend({
diff --git a/assets/js/src/newsletter_editor/blocks/posts.js b/assets/js/src/newsletter_editor/blocks/posts.js
index fb86e65ed1..df9c308004 100644
--- a/assets/js/src/newsletter_editor/blocks/posts.js
+++ b/assets/js/src/newsletter_editor/blocks/posts.js
@@ -132,8 +132,8 @@ define([
     modelEvents: {},
     onDragSubstituteBy: function() { return Module.PostsWidgetView; },
     initialize: function() {
+      base.BlockView.prototype.initialize.apply(this, arguments);
       this.toolsView = new Module.PostsBlockToolsView({ model: this.model });
-      this.on('showSettings', this.showSettings);
       this.model.reply('blockView', this.notifyAboutSelf, this);
     },
     onRender: function() {
@@ -142,9 +142,6 @@ define([
       }
       this.trigger('showSettings');
     },
-    showSettings: function(options) {
-      this.toolsView.triggerMethod('showSettings', options);
-    },
     notifyAboutSelf: function() {
       return this;
     },
@@ -155,19 +152,6 @@ define([
 
   Module.PostsBlockToolsView = base.BlockToolsView.extend({
     getSettingsView: function() { return Module.PostsBlockSettingsView; },
-    initialize: function() {
-      base.BlockToolsView.prototype.initialize.apply(this, arguments);
-      this.on('showSettings', this.changeSettings);
-      this.settingsView = new Module.PostsBlockSettingsView({ model: this.model });
-    },
-    changeSettings: function() {
-      this.settingsView.render();
-    },
-    onBeforeDestroy: function() {
-      this.settingsView.destroy();
-      this.off('showSettings');
-      MailPoet.Modal.close();
-    },
   });
 
   Module.PostsBlockSettingsView = base.BlockSettingsView.extend({