Merge branch 'hotfix/free-lessons-fix' into 'master'

окно реги при просмотре 3 минут бесплатного урока

See merge request lilschool/site!361
remotes/origin/hotfix/popup-fix
Danil 7 years ago
commit a041daddc2
  1. 2
      apps/school/templates/school/free_lessons.html
  2. 12
      web/src/js/modules/popup.js

@ -14,7 +14,7 @@
<div class="section section_video">
<div class="section__center center center_sm" style="text-align: center;">
<img class="main-video-preview js-video-modal" data-video-url="{{ config.FREE_LESSONS_VIDEO_URL|safe }}" data-trial-lesson="1"
<img class="main-video-preview js-video-modal" data-video-url="{{ config.FREE_LESSONS_VIDEO_URL|safe }}" data-free-lesson="1"
src="{% if config.FREE_LESSONS_VIDEO_PREVIEW_IMG %}{{ config.FREE_LESSONS_VIDEO_PREVIEW_IMG.url }}{% endif %}"/>
<div style="margin-top: 15px;">Приглашай друзей и получай лилики.
<a href="#" class="btn btn_stroke-black"

@ -97,13 +97,15 @@ $(document).ready(function () {
});
$(".js-video-modal").on('player-created', e => {
if(window.LIL_STORE.user.id || ! $(e.target).data('trialLesson') || Cookies.get(EMAIL_CAPTURED_COOKIE)){
if(window.LIL_STORE.user.id || $(e.target).data('trialLesson') && Cookies.get(EMAIL_CAPTURED_COOKIE)
|| ! $(e.target).data('freeLesson')){
return;
}
const channel = $(e.target).data('channel');
const player = e.detail.player;
let timeout = null;
const interval = 1000 * 60; // 1 min
const freeLesson = $(e.target).data('freeLesson')
const interval = 1000 * (freeLesson ? 180 : 60); // 1 min
const pauseVideo = () => {
timeout = setTimeout(() => {
clearTimeout(timeout);
@ -118,6 +120,11 @@ $(document).ready(function () {
player.pause();
}
$modalVideo.css('opacity', 0);
if(freeLesson){
popup = $('.js-popup-auth');
showPopup();
}
else{
captureEmail(true).then(() => {
$modalVideo.css('opacity', 1);
Cookies.set(EMAIL_CAPTURED_COOKIE, 1);
@ -130,6 +137,7 @@ $(document).ready(function () {
}).catch(() => {
$('.modal-video').remove();
});
}
}, interval);
}
if(channel == 'youtube'){

Loading…
Cancel
Save