Merge branch 'ticket-blockbestsellerProduct' into develop

This commit is contained in:
Marion Muszynski 2016-06-28 15:03:29 +02:00
commit 18238f3c9d

View File

@ -2,11 +2,13 @@
{literal} {literal}
function hideExpressCart(event){ function hideExpressCart(event){
if(".button.expresscart.active" == $(event.target)) { if($(".expresscart_frame:visible").length > 0) {
event.data.m.removeClass('active'); event.data.m.removeClass('active');
$(".expresscart_frame").slideUp(); $(".expresscart_frame").slideUp();
$("html").unbind("click", hideExpressCart); $(".expresscart_frame").remove();
$('.close_popup_footer').remove(); $('.close_popup_footer').remove();
$("html").unbind("click", hideExpressCart);
initButtons();
} }
return false; return false;
} }
@ -33,9 +35,9 @@ function showExpressCart(event) {
return false; return false;
}); });
$("html").bind("click", {m: m}, hideExpressCart);
}); });
} }
$("html").bind("click", {m: m}, hideExpressCart);
return false; return false;
} }