Merge pull request #354 from mailpoet/parsley_firefox_fix

fixed parsley issue with firefox
This commit is contained in:
Tautvidas Sipavičius
2016-02-16 12:32:29 +02:00

View File

@@ -26,7 +26,8 @@ define(
"Tempt them to open your email.", "Tempt them to open your email.",
type: 'text', type: 'text',
validation: { validation: {
'data-parsley-required': true 'data-parsley-required': true,
'data-parsley-required-message': 'You need to specify a subject.'
} }
}, },
{ {
@@ -42,7 +43,8 @@ define(
return !!(!segment.deleted_at); return !!(!segment.deleted_at);
}, },
validation: { validation: {
'data-parsley-required': true 'data-parsley-required': true,
'data-parsley-required-message': 'You need to select a segment.'
} }
}, },
{ {
@@ -107,8 +109,16 @@ define(
mixins: [ mixins: [
Router.History Router.History
], ],
componentDidMount: function() {
jQuery('#mailpoet_newsletter').parsley();
},
isValid: function() {
return jQuery('#mailpoet_newsletter').parsley().isValid();
},
handleSend: function() { handleSend: function() {
if(jQuery('#mailpoet_newsletter').parsley().validate() === true) { if(!this.isValid()) {
jQuery('#mailpoet_newsletter').parsley().validate();
} else {
MailPoet.Ajax.post({ MailPoet.Ajax.post({
endpoint: 'sendingQueue', endpoint: 'sendingQueue',
action: 'add', action: 'add',
@@ -132,9 +142,7 @@ define(
); );
} else { } else {
if(response.errors) { if(response.errors) {
MailPoet.Notice.error( MailPoet.Notice.error(response.errors);
response.errors.join("<br />")
);
} else { } else {
MailPoet.Notice.error( MailPoet.Notice.error(
'An error occurred while trying to send. '+ 'An error occurred while trying to send. '+
@@ -144,6 +152,7 @@ define(
} }
}.bind(this)); }.bind(this));
} }
return false;
}, },
render: function() { render: function() {
return ( return (
@@ -158,6 +167,7 @@ define(
fields={ fields } fields={ fields }
params={ this.props.params } params={ this.props.params }
messages={ messages } messages={ messages }
isValid={ this.isValid }
> >
<p className="submit"> <p className="submit">
<input <input