Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix rendering of Posts settings

Browse Source
This commit is contained in:
Tautvidas Sipavičius
2015-10-07 13:19:19 +03:00
parent 8a5bf93db2
commit 3cfe9a9acc
3 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/newsletter_editor/blocks/automatedLatestContent.js
View File

@@ -61,7 +61,7 @@ define([
}; };
}, },
initialize: function() { initialize: function() {
base.BlockModel.prototype.initialize.apply(this); base.BlockView.prototype.initialize.apply(this, arguments);
this.fetchPosts(); 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.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); this.listenTo(this.get('readMoreButton'), 'change', this._scheduleFetchPosts);

4
assets/js/src/newsletter_editor/blocks/base.js
View File

@@ -189,7 +189,6 @@ define([
}); });
}, },
close: function(event) { close: function(event) {
MailPoet.Modal.cancel();
this.destroy(); this.destroy();
}, },
changeField: function(field, event) { changeField: function(field, event) {
@@ -211,6 +210,9 @@ define([
} }
this.model.set(field, value); this.model.set(field, value);
}, },
onBeforeDestroy: function() {
MailPoet.Modal.close();
},
}); });
Module.WidgetView = Marionette.ItemView.extend({ Module.WidgetView = Marionette.ItemView.extend({

18
assets/js/src/newsletter_editor/blocks/posts.js
View File

@@ -132,8 +132,8 @@ define([
modelEvents: {}, modelEvents: {},
onDragSubstituteBy: function() { return Module.PostsWidgetView; }, onDragSubstituteBy: function() { return Module.PostsWidgetView; },
initialize: function() { initialize: function() {
base.BlockView.prototype.initialize.apply(this, arguments);
this.toolsView = new Module.PostsBlockToolsView({ model: this.model }); this.toolsView = new Module.PostsBlockToolsView({ model: this.model });
this.on('showSettings', this.showSettings);
this.model.reply('blockView', this.notifyAboutSelf, this); this.model.reply('blockView', this.notifyAboutSelf, this);
}, },
onRender: function() { onRender: function() {
@@ -142,9 +142,6 @@ define([
} }
this.trigger('showSettings'); this.trigger('showSettings');
}, },
showSettings: function(options) {
this.toolsView.triggerMethod('showSettings', options);
},
notifyAboutSelf: function() { notifyAboutSelf: function() {
return this; return this;
}, },
@@ -155,19 +152,6 @@ define([
Module.PostsBlockToolsView = base.BlockToolsView.extend({ Module.PostsBlockToolsView = base.BlockToolsView.extend({
getSettingsView: function() { return Module.PostsBlockSettingsView; }, 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({ Module.PostsBlockSettingsView = base.BlockSettingsView.extend({