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

fixed issue with setToken injecting a /n

Browse Source
This commit is contained in:
Jonathan Labreuille
2015-08-21 15:02:24 +02:00
parent 311acd1ee0
commit c473338d19
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
assets/js/src/settings.jsx
View File

@ -22,7 +22,7 @@ define('settings', ['react/addons', 'jquery', 'mailpoet'], function(React, jQuer
}.bind(this) }.bind(this)
}); });
}, },
save: function(e) { handleSubmit: function(e) {
this.setState({ loading: true }); this.setState({ loading: true });
e.preventDefault(); e.preventDefault();
@ -67,7 +67,7 @@ define('settings', ['react/addons', 'jquery', 'mailpoet'], function(React, jQuer
}, },
render: function() { render: function() {
return ( return (
<form className="mailpoet_settings_form"> <form onSubmit={this.handleSubmit} className="mailpoet_settings_form">
<p> <p>
<label> <label>
From name: From name:
@ -98,7 +98,6 @@ define('settings', ['react/addons', 'jquery', 'mailpoet'], function(React, jQuer
<input <input
ref="submit" ref="submit"
type="submit" type="submit"
onClick={this.save}
className="button button-primary" className="button button-primary"
disabled={this.state.loading} disabled={this.state.loading}
value="Save" /> value="Save" />

2
lib/Router/Router.php
View File

@ -32,7 +32,7 @@ class Router {
function setToken() { function setToken() {
$global = '<script type="text/javascript">'; $global = '<script type="text/javascript">';
$global .= 'var mailpoet_token = "'.Security::generateToken().'";'; $global .= 'var mailpoet_token = "'.Security::generateToken().'";';
$global .= "</script>/n"; $global .= "</script>";
echo $global; echo $global;
} }