diff --git a/assets/js/src/newsletter_editor/blocks/posts.js b/assets/js/src/newsletter_editor/blocks/posts.js index 65b32141f9..4dde9f7f2b 100644 --- a/assets/js/src/newsletter_editor/blocks/posts.js +++ b/assets/js/src/newsletter_editor/blocks/posts.js @@ -261,9 +261,9 @@ define([ var PostSelectionSettingsView = Marionette.CompositeView.extend({ getTemplate: function() { return templates.postSelectionPostsBlockSettings; }, - getChildView: function() { return SinglePostSelectionSettingsView; }, + childView: function() { return SinglePostSelectionSettingsView; }, childViewContainer: '.mailpoet_post_selection_container', - getEmptyView: function() { return EmptyPostSelectionSettingsView; }, + emptyView: function() { return EmptyPostSelectionSettingsView; }, childViewOptions: function() { return { blockModel: this.model, diff --git a/assets/js/src/newsletter_editor/blocks/social.js b/assets/js/src/newsletter_editor/blocks/social.js index 0b876ddf56..3ebdd5e483 100644 --- a/assets/js/src/newsletter_editor/blocks/social.js +++ b/assets/js/src/newsletter_editor/blocks/social.js @@ -148,18 +148,9 @@ define([ ShowSettingsBehavior: {}, }, onDragSubstituteBy: function() { return Module.SocialWidgetView; }, - //constructor: function() { - //// Set the block collection to be handled by this view as well - //arguments[0].collection = arguments[0].model.get('icons'); - //Marionette.CompositeView.apply(this, arguments); - //}, initialize: function() { this.on('showSettings', this.showSettings, this); - //this.on('dom:refresh', this.showBlock, this); - //this._isFirstRender = true; }, - // Determines which view type should be used for a child - //childView: SocialIconView, templateContext: function() { return { model: this.model.toJSON(), @@ -167,16 +158,12 @@ define([ }; }, onRender: function() { - //this._rebuildRegions(); this.toolsView = new Module.SocialBlockToolsView({ model: this.model }); this.showChildView('toolsRegion', this.toolsView); this.showChildView('icons', new Module.SocialIconCollectionView({ collection: this.model.get('icons') })) }, - //onBeforeDestroy: function() { - //this.regionManager.destroy(); - //}, showTools: function(_event) { this.$(this.ui.tools).addClass('mailpoet_display_tools'); _event.stopPropagation(); @@ -193,29 +180,6 @@ define([ return this.model.clone(); }.bind(this); }, - //_buildRegions: function(regions) { - //var that = this; - - //var defaults = { - //regionClass: this.getOption('regionClass'), - //parentEl: function() { return that.$el; } - //}; - - //return this.regionManager.addRegions(regions, defaults); - //}, - //_rebuildRegions: function() { - //if (this.regionManager === undefined) { - //this.regionManager = new Marionette.RegionManager(); - //} - //this.regionManager.destroy(); - //_.extend(this, this._buildRegions(this.regions)); - //}, - //showBlock: function() { - //if (this._isFirstRender) { - //this.transitionIn(); - //this._isFirstRender = false; - //} - //}, deleteBlock: function() { this.transitionOut().done(function() { this.model.destroy(); diff --git a/views/newsletter/templates/blocks/automatedLatestContent/settings.hbs b/views/newsletter/templates/blocks/automatedLatestContent/settings.hbs index 36afd52098..1d1458bf56 100644 --- a/views/newsletter/templates/blocks/automatedLatestContent/settings.hbs +++ b/views/newsletter/templates/blocks/automatedLatestContent/settings.hbs @@ -15,7 +15,7 @@