diff --git a/assets/js/src/form/fields/selection.jsx b/assets/js/src/form/fields/selection.jsx index 66fccbd56a..3c4442b4fc 100644 --- a/assets/js/src/form/fields/selection.jsx +++ b/assets/js/src/form/fields/selection.jsx @@ -30,6 +30,9 @@ function( .trigger('change'); } }, + componentWillUnmount: function() { + jQuery('#'+this.refs.select.id).select2('destroy'); + }, setupSelect2: function() { if( !this.props.field.multiple @@ -161,4 +164,4 @@ function( }); return Selection; -}); \ No newline at end of file +}); diff --git a/assets/js/src/form/form.jsx b/assets/js/src/form/form.jsx index 4de15f73a0..66d118581e 100644 --- a/assets/js/src/form/form.jsx +++ b/assets/js/src/form/form.jsx @@ -49,7 +49,6 @@ define( } else { this.loadItem(props.params.id); } - console.log('Receiving props', arguments); }, loadItem: function(id) { this.setState({ loading: true }); diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx index 06e0bb0b52..1225055920 100644 --- a/assets/js/src/newsletters/send.jsx +++ b/assets/js/src/newsletters/send.jsx @@ -59,7 +59,7 @@ define( endpoint: 'newsletters', action: 'get', data: id - }).done(function(response) { + }).done((response) => { if(response === false) { this.setState({ loading: false, @@ -74,7 +74,7 @@ define( fields: this.getFieldsByNewsletter(response), }); } - }.bind(this)); + }); }, getFieldsByNewsletter: function(newsletter) { switch(newsletter.type) { @@ -150,22 +150,16 @@ define( }); }, handleFormChange: function(e) { - console.log('Form change', e); var item = this.state.item, field = e.target.name; item[field] = e.target.value; - console.log('State before change', this.state); this.setState({ item: item }); - console.log('State after change', this.state); return true; }, - handleFormSubmit: function() { - console.log('Handling form submit', arguments); - }, getParams: function() { return {}; }, diff --git a/assets/js/src/newsletters/types/notification/notification.jsx b/assets/js/src/newsletters/types/notification/notification.jsx index 2d0a572bb8..e19708fbad 100644 --- a/assets/js/src/newsletters/types/notification/notification.jsx +++ b/assets/js/src/newsletters/types/notification/notification.jsx @@ -48,7 +48,8 @@ define( endpoint: 'newsletters', action: 'create', data: _.extend({}, this.state, { - type: 'notification' + type: 'notification', + subject: MailPoet.I18n.t('draftNewsletterTitle'), }), }).done(function(response) { if(response.result && response.newsletter.id) { diff --git a/assets/js/src/newsletters/types/welcome/welcome.jsx b/assets/js/src/newsletters/types/welcome/welcome.jsx index 0f11595489..dcdff40439 100644 --- a/assets/js/src/newsletters/types/welcome/welcome.jsx +++ b/assets/js/src/newsletters/types/welcome/welcome.jsx @@ -48,7 +48,8 @@ define( endpoint: 'newsletters', action: 'create', data: _.extend({}, this.state, { - type: 'welcome' + type: 'welcome', + subject: MailPoet.I18n.t('draftNewsletterTitle'), }), }).done(function(response) { if(response.result && response.newsletter.id) {