From af5f744ba89e66ce47b162e735064736b514e0b6 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 13 Jan 2026 13:55:06 +0100 Subject: [PATCH] wip #7939 @0.5 --- .../fluidbook/cart/fluidbook.cart.kimplay.js | 54 +++++----- js/libs/fluidbook/fluidbook.links.js | 2 - js/libs/fluidbook/fluidbook.menu.js | 1 - js/libs/fluidbook/fluidbook.sound.js | 7 +- js/libs/fluidbook/fluidbook.video.js | 98 +++++++++---------- js/main.js | 3 - 6 files changed, 67 insertions(+), 98 deletions(-) diff --git a/js/libs/fluidbook/cart/fluidbook.cart.kimplay.js b/js/libs/fluidbook/cart/fluidbook.cart.kimplay.js index f73ce39b..82d2c9b9 100644 --- a/js/libs/fluidbook/cart/fluidbook.cart.kimplay.js +++ b/js/libs/fluidbook/cart/fluidbook.cart.kimplay.js @@ -17,6 +17,22 @@ FluidbookCartKimplay.prototype = { }, addToCart: function (ref, quantity) { + let view = `
+
+

${this.data[ref].name}

+
(réf. ${ref})
+
+ Quantité souhaitée :
+
+ Commentaire (facultatif) +
+ +
+
`; + this.fluidbook.menu.viewWrap(view, 'cart'); + }, + + _addToCart: function (ref, quantity) { if (this.items.indexOf(ref) === -1) { this.items.push(ref); this.save(); @@ -50,17 +66,15 @@ FluidbookCartKimplay.prototype = { getItemsReferences: function () { return this.getItems(); - }, - getItemsNumbers: function () { + }, getItemsNumbers: function () { return this.getItems().length; - }, - getAllQuantities: function () { + }, getAllQuantities: function () { return this.getItemsNumbers(); }, updateCart: function () { - if ($('#flexipancart').length > 0) { - $('#flexipancart .content').html(this.getCartContent()); + if ($('#kimplaycart').length > 0) { + $('#kimplaycart .content').html(this.getCartContent()); } }, @@ -85,7 +99,7 @@ FluidbookCartKimplay.prototype = { } var $this = this; - var content = ''; + var content = '
'; content += ''; content += ''; content += ''; @@ -118,33 +132,9 @@ FluidbookCartKimplay.prototype = { return content; }, - exportPDF: function () { - - var element = $('#flexipancarttable').get(0); - var options = { - margin: 15, - filename: this.getExportFileName() + '.pdf', - image: {type: 'jpeg', quality: 0.98}, - html2canvas: {dpi: 150, scale: 2, letterRendering: true}, - jsPDF: {unit: 'mm', format: 'A4', orientation: 'portrait'} - }; - $(element).addClass('print') - html2pdf().set(options).from(element).save().then(function () { - $(element).removeClass('print'); - }); - - setTimeout(function () { - $(element).removeClass('print'); - }, 2000); - }, - - getExportFileName: function () { - var date = new Date(); - return this.fluidbook.settings.title + ' - Cart - ' + date.getFullYear() + '-' + date.getMonth() + '-' + date.getDay(); - }, _endMenu: function (title, content, callback) { - var view = '
'; + var view = '
'; view += this.fluidbook.menu.getCaption(title); view += '
'; view += "" + content; diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index 00ecf6d6..780e5f28 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -872,8 +872,6 @@ FluidbookLinks.prototype = { return; } - console.log(container); - var animateBookmarks = (this.fluidbook.settings.bookmarkBlinkOnPageChange == true); var $this = this; diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js index 3d1368cd..b9c2a652 100644 --- a/js/libs/fluidbook/fluidbook.menu.js +++ b/js/libs/fluidbook/fluidbook.menu.js @@ -9,7 +9,6 @@ FluidbookMenu.prototype = { this.closeEventSent = false; this.index = new FluidbookIndex(this.fluidbook); this.pdfform = new FluidbookPDFForm(this.fluidbook); - console.log(this.pdfform); var $this = this; diff --git a/js/libs/fluidbook/fluidbook.sound.js b/js/libs/fluidbook/fluidbook.sound.js index 0d46bf51..148214f9 100644 --- a/js/libs/fluidbook/fluidbook.sound.js +++ b/js/libs/fluidbook/fluidbook.sound.js @@ -134,7 +134,6 @@ FluidbookSound.prototype = { let $this = this; let res = false; $.each(this.fluidbook.video.getActivePlayers(), function (k, player) { - console.log(player); if (player.muted()) { return; } @@ -158,11 +157,7 @@ FluidbookSound.prototype = { }, isAudioPlaying: function (a) { - return a - && a.currentTime > 0 - && !a.paused - && !a.ended - && a.readyState > 2; + return a && a.currentTime > 0 && !a.paused && !a.ended && a.readyState > 2; }, pauseAmbientIfSomethingIsPlaying: function () { diff --git a/js/libs/fluidbook/fluidbook.video.js b/js/libs/fluidbook/fluidbook.video.js index 662d2526..5d89883e 100644 --- a/js/libs/fluidbook/fluidbook.video.js +++ b/js/libs/fluidbook/fluidbook.video.js @@ -37,7 +37,6 @@ function FluidbookVideo(fluidbook) { this.fluidbook = fluidbook; - this.video = (Modernizr.video && (Modernizr.video.h264 || Modernizr.video.webm || Modernizr.video.ogg)) != false; this.videoFormats = []; @@ -45,30 +44,28 @@ function FluidbookVideo(fluidbook) { var maybe = []; var not = []; - if (this.video) { - var formats = this.fluidbook.settings.videoFormats; - for (var i = 0; i < formats.length; i++) { - var f = formats[i]; - if (f == 'mp4') { - f = 'h264'; - } - if (f == 'ogv') { - f = 'ogg'; - } - var support = Modernizr.video[f]; - if (f == 'ogg') { - f = 'ogv'; - } - if (f == 'h264') { - f = 'mp4'; - } - if (support == 'probably') { - probably.push(f); - } else if (support == 'maybe') { - maybe.push(f); - } else { - not.push(f); - } + var formats = this.fluidbook.settings.videoFormats; + for (var i = 0; i < formats.length; i++) { + var f = formats[i]; + if (f == 'mp4') { + f = 'h264'; + } + if (f == 'ogv') { + f = 'ogg'; + } + var support = Modernizr.video[f]; + if (f == 'ogg') { + f = 'ogv'; + } + if (f == 'h264') { + f = 'mp4'; + } + if (support == 'probably') { + probably.push(f); + } else if (support == 'maybe') { + maybe.push(f); + } else { + not.push(f); } } @@ -167,7 +164,7 @@ FluidbookVideo.prototype = { } html = '
'; @@ -301,7 +295,9 @@ FluidbookVideo.prototype = { } function syncAudioAndVideo(audioTrackList) { - var enabledTrack = audioTrackList.tracks_.filter((n) => { return n.enabled; })[0]; + var enabledTrack = audioTrackList.tracks_.filter((n) => { + return n.enabled; + })[0]; if (enabledTrack) { $("audio#" + enabledTrack.id)[0].currentTime = player.currentTime(); @@ -317,7 +313,9 @@ FluidbookVideo.prototype = { } function getEnabledTrack(audioTrackList) { - return audioTrackList.tracks_.filter((n) => { return n.enabled; })[0]; + return audioTrackList.tracks_.filter((n) => { + return n.enabled; + })[0]; } // Get the current player's AudioTrackList object. @@ -325,11 +323,8 @@ FluidbookVideo.prototype = { player.ready(function () { // Hide CC if disabled in video settings - console.log('cc', cc); if (!cc) { - console.log('cc disabled'); var tracks = player.textTracks(); - console.log(tracks); for (var i = 0; i < tracks.length; i++) { var track = tracks[i]; @@ -397,14 +392,11 @@ FluidbookVideo.prototype = { if (repeat >= 0 && loop) { let repeatCount = repeat + 1; - player.on('ended', function () { - console.log('ended', repeatCount, player); if (repeatCount === 0) { player.pause(); return; } else { - console.log(player); player.currentTime(0); player.play(); } @@ -418,6 +410,7 @@ FluidbookVideo.prototype = { if (settings.paused) { player.pause(); player.one('play', function () { + console.log(':!!!'); sendPlayEvent(); }); } else { @@ -436,8 +429,7 @@ FluidbookVideo.prototype = { }); var enabledTrack = getEnabledTrack(audioTrackList) - console.log("enabledTrack",enabledTrack) - if(enabledTrack) { + if (enabledTrack) { $("audio#" + enabledTrack.id)[0].play(); } syncAudioAndVideo(audioTrackList) @@ -458,7 +450,7 @@ FluidbookVideo.prototype = { }); let enabledTrack = getEnabledTrack(audioTrackList) - if(enabledTrack) { + if (enabledTrack) { syncAudioAndVideo(audioTrackList) $("audio#" + enabledTrack.id)[0].pause(); } @@ -471,19 +463,19 @@ FluidbookVideo.prototype = { }); // Listen to the "change" event. - audioTrackList.addEventListener('change', function() { + audioTrackList.addEventListener('change', function () { player.muted(1) resetAudios() var track = getEnabledTrack(audioTrackList); - console.log("player.paused()",player.paused()) + console.log("player.paused()", player.paused()) - if(track && !player.paused()) { - $("audio#"+track.id)[0].play() + if (track && !player.paused()) { + $("audio#" + track.id)[0].play() syncAudioAndVideo(audioTrackList) - console.log("audioTrackList",audioTrackList) + console.log("audioTrackList", audioTrackList) return; } @@ -501,7 +493,7 @@ FluidbookVideo.prototype = { $this.fluidbook.contentlock.addAction(linkid, 'complete'); syncAudioAndVideo(audioTrackList) var enabledTrack = getEnabledTrack(audioTrackList); - if(enabledTrack) { + if (enabledTrack) { enabledTrack.enabled = false $("audio#" + enabledTrack.id)[0].pause() $("audio#" + enabledTrack.id)[0].currentTime = 0 @@ -606,7 +598,7 @@ FluidbookVideo.prototype = { }, hasOneVideoPlaying: function () { - let res= false; + let res = false; $.each(this.getActivePlayers(), function (k, player) { if (player.muted()) { //return; @@ -648,8 +640,6 @@ FluidbookVideo.prototype = { disposeVideo: function (player) { var id = player.id(); - console.log('id',id) - console.log("this",$(this)) // Save the current player info if it has started if (player.hasStarted()) { diff --git a/js/main.js b/js/main.js index fcf2cf76..ede60453 100644 --- a/js/main.js +++ b/js/main.js @@ -255,7 +255,6 @@ try { } INITED = true; - console.log('init fluidbook ' + window.location); try { window.fluidbook = new Fluidbook(SETTINGS); } catch (e) { @@ -289,8 +288,6 @@ try { } function initEvents() { - console.log('init events'); - resize(true); if (SETTINGS.preventRightClick) { -- 2.39.5