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

Better naming

Browse Source 
[MAILPOET-1974]
This commit is contained in:
Ján Mikláš
2019-05-13 10:05:12 +02:00
committed by M. Shull
parent ae46c45aff
commit 748fbdf863
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,15 +226,15 @@ Module.BlockToolsView = AugmentedView.extend({
},
changeSettings: function changeSettings(options) {
var ViewType = this.getSettingsView();
var showedSettingsId = App.getShowedSettingsId();
if (showedSettingsId) {
if (showedSettingsId === this.model.cid) {
var displayedSettingsId = App.getDisplayedSettingsId();
if (displayedSettingsId) {
if (displayedSettingsId === this.model.cid) {
return;
}
App.getChannel().trigger('hideSettings');
return;
}
App.getChannel().trigger('settingsShowed', this.model.cid);
App.getChannel().trigger('settingsDisplayed', this.model.cid);
(new ViewType(_.extend({ model: this.model }, options || {}))).render();
},
showDeletionConfirmation: function showDeletionConfirmation() {
@@ -326,7 +326,7 @@ Module.BlockSettingsView = Marionette.View.extend({
onBeforeDestroy: function onBeforeDestroy() {
MailPoet.Modal.close();
this.model.trigger('stopEditing');
App.getChannel().trigger('settingsShowed', null);
App.getChannel().trigger('settingsDisplayed', null);
},
});