From 03a7bd7136c1f425fc35986bd3ee7ffa8d7f9152 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 4 Jan 2021 20:16:32 +0100 Subject: [PATCH] wait #4157 @1 --- js/libs/fluidbook/fluidbook.links.js | 20 +++++++++++++++++++- js/libs/fluidbook/fluidbook.video.js | 19 +++++++++++++++++++ style/audioplayer.less | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index ed8a7825..6f15bc72 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -302,6 +302,25 @@ FluidbookLinks.prototype = { return u.href; }, + showLinkById(id) { + var s = $('div.link[data-id="' + id + '"]'); + s.show(); + setTimeout(function () { + s.addClass('show'); + }, 10); + + }, + + hideLinkById(id) { + var s = $('div.link[data-id="' + id + '"]'); + if ($(s).attr('data-hidden') != '1') { + $(s).attr('data-hidden', '1').addClass('show'); + } + setTimeout(function () { + $(s).removeClass('show'); + }, 10); + }, + hidePlacedLink: function (p, timeout) { if ($(p).length === 0) { return; @@ -310,7 +329,6 @@ FluidbookLinks.prototype = { timeout = 0; } setTimeout(function () { - $(p).removeClass('show'); $(p).find('.linkshowclose').remove(); setTimeout(function () { diff --git a/js/libs/fluidbook/fluidbook.video.js b/js/libs/fluidbook/fluidbook.video.js index 6ea4590e..e14ae465 100644 --- a/js/libs/fluidbook/fluidbook.video.js +++ b/js/libs/fluidbook/fluidbook.video.js @@ -109,6 +109,8 @@ FluidbookVideo.prototype = { poster, html, player; + var hidelinksonplay = $(e).data('hidelinksonplay') === '' ? [] : $(e).data('hidelinksonplay').split(','); + console.log('to hide', hidelinksonplay); //console.log('Initialising video ID: ' + id); @@ -238,9 +240,15 @@ FluidbookVideo.prototype = { setTimeout(function () { player.pause(); }, 100); + } else { + console.log('hide ', hidelinksonplay); + $.each(hidelinksonplay, function (k, id) { + $this.fluidbook.links.hideLinkById(id); + }); } }); + player.play(); // Start player to go to current position - necessary even if it will be paused immediately if (settings.paused) { player.pause(); @@ -264,6 +272,12 @@ FluidbookVideo.prototype = { }); + player.on('play', function () { + $.each(hidelinksonplay, function (k, id) { + $this.fluidbook.links.hideLinkById(id); + }); + }); + player.on('pause', function () { // console.log(id + ' player paused'); @@ -275,6 +289,11 @@ FluidbookVideo.prototype = { player.one('play', function () { this.bigPlayButton.hide(); }); + + + $.each(hidelinksonplay, function (k, id) { + $this.fluidbook.links.showLinkById(id); + }); }); // player.on('fullscreenchange', function() { diff --git a/style/audioplayer.less b/style/audioplayer.less index a340e520..30f7fe28 100644 --- a/style/audioplayer.less +++ b/style/audioplayer.less @@ -16,7 +16,7 @@ audio { .icon { position: absolute; top: 0; - left: 0; + left: 2px; width: 100%; height: 100%; color: #fff; -- 2.39.5