From: Vincent Vanwaelscappel Date: Thu, 24 Jul 2025 14:28:05 +0000 (+0200) Subject: wait #7658 @1.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a019f5208ccd086d1fb738513dea098a81644f96;p=fluidbook-html5.git wait #7658 @1.5 --- diff --git a/js/libs/fluidbook/fluidbook.links.animations.js b/js/libs/fluidbook/fluidbook.links.animations.js index ea1fe562..9ac163c5 100644 --- a/js/libs/fluidbook/fluidbook.links.animations.js +++ b/js/libs/fluidbook/fluidbook.links.animations.js @@ -7,7 +7,7 @@ function FluidbookLinksAnimations(fluidbook) { FluidbookLinksAnimations.prototype = { - executeAnimations(element, animations, properties, autostart, delay) { + executeAnimations(element, animations, autostart, delay) { let $this = this; var defaults = ['ease', 'duration', 'delay']; var firstDefaults = {}; @@ -25,6 +25,9 @@ FluidbookLinksAnimations.prototype = { } if (autostart && !animations[0]['autostart']) { + if(animations[0]['type']==='pie'){ + $(element).css('border-radius', '50%'); + } return; } @@ -320,11 +323,11 @@ FluidbookLinksAnimations.prototype = { var paper = new Raphael(link.attr('id'), w, h); var bgc = link.attr('data-color'); to.angle = animation.startangle + 360; - if (animation.hideonstart == '1') { - to.onStart = function () { - link.css('background-color', "transparent"); - }; - } + // if (animation.hideonstart == '1') { + // to.onStart = function () { + // link.css('background-color', "transparent"); + // }; + // } to.onUpdate = function () { paper.clear(); if (Math.abs(linkElement.angle - from.angle) < 2) { diff --git a/js/libs/scorm/scorm.js b/js/libs/scorm/scorm.js index 97fb7507..41d0ff5c 100644 --- a/js/libs/scorm/scorm.js +++ b/js/libs/scorm/scorm.js @@ -547,7 +547,7 @@ function getScormTimeInterval(start, end) { } function scormSecondsToTimeInterval(diff) { - var diff = Math.round(diff); + diff = Math.round(diff); var h = Math.floor(diff / 3600); diff = diff % 3600; var m = Math.floor(diff / 60);