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

Display close button

Browse Source 
[MAILPOET-2740]
This commit is contained in:
Pavel Dohnal
2020-04-08 16:09:23 +02:00
committed by Veljko V
parent 18daadd3ec
commit b00e56ce06
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/css/src/components-public/_public.scss
View File

@@ -188,7 +188,7 @@ div.mailpoet_form_popup {
z-index: 1001; z-index: 1001;
} }
.mailpoet_popup_close_icon { .mailpoet_form_close_icon {
cursor: pointer; cursor: pointer;
display: block; display: block;
margin: 0 0 0 auto; margin: 0 0 0 auto;
@@ -229,7 +229,7 @@ div.mailpoet_form_fixed_bar {
.mailpoet_form_popup_overlay.active, .mailpoet_form_popup_overlay.active,
div.mailpoet_form_popup.active, div.mailpoet_form_popup.active,
div.mailpoet_form_fixed_bar { div.mailpoet_form_fixed_bar.active {
display: block; display: block;
} }

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

@@ -70,6 +70,13 @@ jQuery(($) => {
} }
setTimeout(() => { setTimeout(() => {
formDiv.addClass('active'); formDiv.addClass('active');
if (form.width() < 500) {
form.addClass('mailpoet_form_tight_container');
} else {
form.removeClass('mailpoet_form_tight_container');
}
if (showOverlay) { if (showOverlay) {
formDiv.prev('.mailpoet_form_popup_overlay').addClass('active'); formDiv.prev('.mailpoet_form_popup_overlay').addClass('active');
} }
@@ -77,18 +84,20 @@ jQuery(($) => {
} }
$(() => { $(() => {
const closePopupForm = (formDiv) => { const closeForm = (formDiv) => {
formDiv.removeClass('active'); formDiv.removeClass('active');
formDiv.prev('.mailpoet_form_popup_overlay').removeClass('active'); formDiv.prev('.mailpoet_form_popup_overlay').removeClass('active');
setCookie('popup_form_dismissed', '1', 365); setCookie('popup_form_dismissed', '1', 365);
}; };
$('.mailpoet_popup_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();
closePopupForm(formDiv); closeForm(formDiv);
}); });
$('div.mailpoet_form_fixed_bar').each((index, element) => { $('div.mailpoet_form_fixed_bar').each((index, element) => {
const cookieValue = getCookie('popup_form_dismissed');
if (cookieValue === '1') return;
const formDiv = $(element); const formDiv = $(element);
showForm(formDiv); showForm(formDiv);
}); });

4
views/form/front_end_form.html
View File

@@ -9,9 +9,9 @@
<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 form_type == 'popup' %> <% if form_type == 'popup' or form_type == 'fixed_bar' %>
<img <img
class="mailpoet_popup_close_icon" class="mailpoet_form_close_icon"
alt="close" alt="close"
width=15 width=15
height=15 height=15