From 03f0462dcd468e1eee01d8503293d084b5a3144a Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 25 Aug 2020 15:14:26 +0200 Subject: [PATCH] wip #3785 @0.5 --- js/libs/fluidbook/fluidbook.links.js | 37 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index b7d65681..f0a04842 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -373,7 +373,7 @@ FluidbookLinks.prototype = { animation.type = 'none'; } var defaultParams = {}; - var globalDefault = {zindex: 0, x: 0, y: 0}; + var globalDefault = {x: 0, y: 0}; var w = parseFloat(link.css('width')); var cx = w / 2; var h = parseFloat(link.css('height')); @@ -457,14 +457,14 @@ FluidbookLinks.prototype = { from.clip = rect; } } else if (animation.type === 'pie') { - defaultParams = {startAngle: '0', direction: 'clockwise', size: 'outside', innerRadius: '0'}; + defaultParams = {startangle: '0', direction: 'clockwise', size: 'outside', innerradius: '0'}; animation = $.extend({}, globalDefault, defaultParams, animation); - animation.startAngle = parseFloat(animation.startAngle); - animation.innerRadius = parseFloat(animation.innerRadius); + animation.startangle = parseFloat(animation.startangle); + animation.innerradius = parseFloat(animation.innerradius); if (animation.direction === 'clockwise') { - from.angle = animation.startAngle + 720; + from.angle = animation.startangle + 720; } else { - from.angle = animation.startAngle; + from.angle = animation.startangle; } linkElement.angle = from.angle; @@ -503,13 +503,13 @@ FluidbookLinks.prototype = { var paper = new Raphael(link.attr('id'), w, h); var bgc = link.attr('data-color'); to.autoCSS = false; - to.angle = animation.startAngle + 360; + to.angle = animation.startangle + 360; to.onStart = function () { link.css('background-color', "transparent"); }; to.onUpdate = function () { paper.clear(); - sector(paper, cx, cy, radius, animation.innerRadius, linkElement.angle, to.angle, { + sector(paper, cx, cy, radius, animation.innerradius, linkElement.angle, to.angle, { fill: bgc, stroke: 'none' }); @@ -517,20 +517,20 @@ FluidbookLinks.prototype = { } else if (animation.type === 'number') { tweenmax = false; defaultParams = { - startValue: '0', - decimalSeparator: '.', - decimalDigitNumber: '0', + startvalue: '0', + decimalseparator: '.', + decimaldigitnumber: '0', separator: ' ', align: 'left', - letterSpacing: '0', + letterspacing: '0', prefix: '', suffix: '', scale: 1, }; animation = $.extend({}, globalDefault, defaultParams, animation); - animation.startValue = parseFloat(animation.startValue.replace(/,/, '.')); - animation.decimalDigitNumber = parseInt(animation.decimalDigitNumber); - animation.letterSpacing = parseFloat(animation.letterSpacing); + animation.startvalue = parseFloat(animation.startvalue.replace(/,/, '.')); + animation.decimaldigitnumber = parseInt(animation.decimaldigitnumber); + animation.letterspacing = parseFloat(animation.letterspacing); var ea = to.ease.split('.'); var ease = window[ea[0]][ea[1]]; @@ -540,8 +540,8 @@ FluidbookLinks.prototype = { useEasing: true, useGrouping: true, separator: animation.separator, - decimalPlaces: animation.decimalDigitNumber, - decimal: animation.decimalSeparator, + decimalPlaces: animation.decimaldigitnumber, + decimal: animation.decimalseparator, prefix: animation.prefix, suffix: animation.suffix, easingFn: function (t, b, c, d) { @@ -551,7 +551,7 @@ FluidbookLinks.prototype = { css = { textAlign: animation.align, - letterSpacing: animation.letterSpacing, + letterSpacing: animation.letterspacing, opacity: 0, transform: "scale(" + animation.scale + ")", } @@ -566,7 +566,6 @@ FluidbookLinks.prototype = { } else { tweenmax = false; } - css = $.extend({zIndex: 500 + parseInt(animation.zindex)}, css); link.css(css); if (from.display !== undefined && from.display !== 'none') { -- 2.39.5