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

Remember currently showed settings model ID

Browse Source 
[MAILPOET-1974]
This commit is contained in:
Ján Mikláš
2019-05-02 13:29:03 +02:00
committed by M. Shull
parent 4817347293
commit 970e835ddc
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
assets/js/src/newsletter_editor/App.js
View File

@@ -21,6 +21,7 @@ var EditorApplication = Marionette.Application.extend({
onStart: function onStart() { onStart: function onStart() {
this._appView = new AppView(); this._appView = new AppView();
this.showView(this._appView); this.showView(this._appView);
this.listenTo(this.getChannel(), 'settingsShowed', this.setShowedSettingsId);
}, },
getChannel: function getChannel(channel) { getChannel: function getChannel(channel) {
@@ -29,6 +30,10 @@ var EditorApplication = Marionette.Application.extend({
} }
return Radio.channel(channel); return Radio.channel(channel);
}, },
setShowedSettingsId: function setShowedSettingsId(id) {
this.showedSettingsId = id;
},
}); });
var app = new EditorApplication(); var app = new EditorApplication();

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

@@ -225,6 +225,7 @@ Module.BlockToolsView = AugmentedView.extend({
}, },
changeSettings: function changeSettings(options) { changeSettings: function changeSettings(options) {
var ViewType = this.getSettingsView(); var ViewType = this.getSettingsView();
App.getChannel().trigger('settingsShowed', this.model.cid);
(new ViewType(_.extend({ model: this.model }, options || {}))).render(); (new ViewType(_.extend({ model: this.model }, options || {}))).render();
}, },
showDeletionConfirmation: function showDeletionConfirmation() { showDeletionConfirmation: function showDeletionConfirmation() {
@@ -313,6 +314,7 @@ Module.BlockSettingsView = Marionette.View.extend({
onBeforeDestroy: function onBeforeDestroy() { onBeforeDestroy: function onBeforeDestroy() {
MailPoet.Modal.close(); MailPoet.Modal.close();
this.model.trigger('stopEditing'); this.model.trigger('stopEditing');
App.getChannel().trigger('settingsShowed', null);
}, },
}); });