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

Always display popups on form preview page

Browse Source 
[MAILPOET-2743]
This commit is contained in:
Rostislav Wolny
2020-04-15 18:31:33 +02:00
committed by Veljko V
parent 0b512fe81b
commit 51f138483c
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/js/src/public.jsx
View File

@@ -73,21 +73,21 @@ jQuery(($) => {
$('.mailpoet_form_close_icon').click((event) => { $('.mailpoet_form_close_icon').click((event) => {
const closeIcon = $(event.target); const closeIcon = $(event.target);
const formDiv = closeIcon.parent(); const formDiv = closeIcon.parent();
if (formDiv.data('is-preview')) return; // Do not close popup in preview
closeForm(formDiv); closeForm(formDiv);
}); });
$('div.mailpoet_form_fixed_bar, div.mailpoet_form_slide_in').each((index, element) => { $('div.mailpoet_form_fixed_bar, div.mailpoet_form_slide_in').each((index, element) => {
const cookieValue = Cookies.get('popup_form_dismissed'); const cookieValue = Cookies.get('popup_form_dismissed');
if (cookieValue === '1') return;
const formDiv = $(element); const formDiv = $(element);
if (cookieValue === '1' && !formDiv.data('is-preview')) return;
showForm(formDiv); showForm(formDiv);
}); });
$('div.mailpoet_form_popup').each((index, element) => { $('div.mailpoet_form_popup').each((index, element) => {
const cookieValue = Cookies.get('popup_form_dismissed'); const cookieValue = Cookies.get('popup_form_dismissed');
if (cookieValue === '1') return;
const formDiv = $(element); const formDiv = $(element);
if (cookieValue === '1' && !formDiv.data('is-preview')) return;
const showOverlay = true; const showOverlay = true;
showForm(formDiv, showOverlay); showForm(formDiv, showOverlay);
}); });

8
views/form/front_end_form.html
View File

@@ -8,7 +8,13 @@
<% endif %> <% endif %>
<div class="mailpoet_form_popup_overlay"></div> <div class="mailpoet_form_popup_overlay"></div>
<div id="<%= form_html_id %>" class="mailpoet_form mailpoet_form_<%= form_type %>"> <div
id="<%= form_html_id %>"
class="mailpoet_form mailpoet_form_<%= form_type %>"
<% if(is_preview) %>
data-is-preview="1"
<% endif %>
>
<% if form_type == 'popup' or form_type == 'fixed_bar' or form_type == 'slide_in' %> <% if form_type == 'popup' or form_type == 'fixed_bar' or form_type == 'slide_in' %>
<img <img
class="mailpoet_form_close_icon" class="mailpoet_form_close_icon"