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

Fix minor PR remarks [MAILPOET-2015]

Browse Source 
Reuse updateCaptcha() function
Inject Captcha class using DI
Add no-cache headers to captcha image
Fix an error when accessing the captcha page directly
Edit the line in settings regarding missing dependencies
This commit is contained in:
wxa
2019-07-11 13:42:47 +03:00
committed by M. Shull
parent 0b8dbf1d27
commit 7788aebe83
12 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
assets/js/src/public.js
View File

@@ -22,6 +22,15 @@ jQuery(function ($) { // eslint-disable-line func-names
return (window.location.hostname === link.hostname);
}
function updateCaptcha(e) {
var captcha = $('img.mailpoet_captcha');
var captchaSrc = captcha.attr('src');
var hashPos = captchaSrc.indexOf('#');
var newSrc = hashPos > 0 ? captchaSrc.substring(0, hashPos) : captchaSrc;
captcha.attr('src', newSrc + '#' + new Date().getTime());
if (e) e.preventDefault();
}
$(function () { // eslint-disable-line func-names
// setup form validation
$('form.mailpoet_form').each(function () { // eslint-disable-line func-names
@@ -68,7 +77,7 @@ jQuery(function ($) { // eslint-disable-line func-names
window.top.location.href = response.meta.redirect_url;
} else {
if (response.meta && response.meta.refresh_captcha) {
$('.mailpoet_captcha_update').click();
updateCaptcha();
}
form.find('.mailpoet_validate_error').html(
response.errors.map(function buildErrorMessage(error) {
@@ -125,13 +134,6 @@ jQuery(function ($) { // eslint-disable-line func-names
});
});
$('.mailpoet_captcha_update').click(function updateCaptcha(e) {
var captcha = $('img.mailpoet_captcha');
var captchaSrc = captcha.attr('src');
var hashPos = captchaSrc.indexOf('#');
var newSrc = hashPos > 0 ? captchaSrc.substring(0, hashPos) : captchaSrc;
captcha.attr('src', newSrc + '#' + new Date().getTime());
e.preventDefault();
});
$('.mailpoet_captcha_update').on('click', updateCaptcha);
});
});