From 0b096d51c3b796bd09cab98bead51adf0fcb7dd1 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 26 Jan 2022 18:19:15 +0100 Subject: [PATCH] wip #5060 @0.25 --- js/libs/fluidbook/fluidbook.3dflip.js | 7 +++++-- js/libs/fluidbook/fluidbook.splash.js | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.3dflip.js b/js/libs/fluidbook/fluidbook.3dflip.js index 9fa6c6cf..31b4b038 100644 --- a/js/libs/fluidbook/fluidbook.3dflip.js +++ b/js/libs/fluidbook/fluidbook.3dflip.js @@ -104,7 +104,7 @@ Fluidbook3DFlip.prototype = { this.container = $(this.jcontainer).get(0); var mode = this.fluidbook.settings.performance3DMode; - if (mode===undefined || mode===null || mode === 'auto') { + if (mode === undefined || mode === null || mode === 'auto') { if ($_GET['performance'] == null) { mode = 'performancesTest'; } else { @@ -460,9 +460,12 @@ Fluidbook3DFlip.prototype = { performancesTest: function (callback) { var _cb; var $this = this; + var timeScale = 1; if (this.performancesMode !== 'performancesTest') { + console.log('no perf test'); _cb = callback; + timeScale = 0.1; } else { _cb = function () { $this.performancesEndTime = new Date(); @@ -473,7 +476,7 @@ Fluidbook3DFlip.prototype = { this.prepareTurn({flip: [1, 2]}, function () { $this.playTurn(1, function () { _cb(); - }, 1); + }, timeScale); }); }, diff --git a/js/libs/fluidbook/fluidbook.splash.js b/js/libs/fluidbook/fluidbook.splash.js index 44fc8a3a..b13ad446 100644 --- a/js/libs/fluidbook/fluidbook.splash.js +++ b/js/libs/fluidbook/fluidbook.splash.js @@ -1,6 +1,6 @@ function FluidbookSplash(fluidbook) { this.fluidbook = fluidbook; - this.hideSplashTimeout = 1; + this.hideSplashTimeout = 0.5; this.isHidding = false; this.init(); } @@ -10,7 +10,10 @@ FluidbookSplash.prototype = { this.waitForTimer = true; this.waitForReady = true; - var defaultMin = 5; + var defaultMin = 1; + if (this.fluidbook.settings.performance3DMode === 'auto') { + defaultMin = 3; + } var min = parseFloat(this.fluidbook.settings.splashMinimalTime); if (min < defaultMin || isNaN(min)) { -- 2.39.5