wait #7658 @1.5

diff --git a/js/libs/fluidbook/fluidbook.links.animations.js b/js/libs/fluidbook/fluidbook.links.animations.js
index ea1fe562de0312f3368fa6fa6d35e1e0832ee656..9ac163c5414a6d1c8f390fcfdbef9e2391fe6638 100644 (file)
--- 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 97fb75074545aa365ec11001719a53aae4c514c0..41d0ff5c551e04e32934d7f2fa46568b415c72ce 100644 (file)
--- 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);