diff --git a/.DS_Store b/.DS_Store index ef07dc3..22eaa18 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/js/Weight Calculation Script-Edited-Jquery-V4.js b/js/Weight Calculation Script-Edited-Jquery-V4.js index 7222b10..2fe665f 100644 --- a/js/Weight Calculation Script-Edited-Jquery-V4.js +++ b/js/Weight Calculation Script-Edited-Jquery-V4.js @@ -43,27 +43,27 @@ // var plateloader = jQuery(".b-platevisual__plates").html(''); // console.log(plateloader); -function animatePlatesOut () { - jQuery('.b-platevisual__plates--left').animate({ - opacity: 0, - left: "-16%", - }, {duration: 500, queue: false }); - jQuery('.b-platevisual__plates--right').animate({ - opacity: 0, - left: "116%", - }, {duration: 500, queue: false }); -} + function animatePlatesOut() { + jQuery('.b-platevisual__plates--left').animate({ + opacity: 0, + left: "-16%", + }, {duration: 500, queue: false }); + jQuery('.b-platevisual__plates--right').animate({ + opacity: 0, + left: "116%", + }, {duration: 500, queue: false }); + } -function animatePlatesIn () { - jQuery('.b-platevisual__plates--left').animate({ - opacity: 1, - left: "21%", - }, {duration: 500, queue: false }); - jQuery('.b-platevisual__plates--right').animate({ - opacity: 1, - left: "79%", - }, {duration: 500, queue: false }); -} + function animatePlatesIn() { + jQuery('.b-platevisual__plates--left').animate({ + opacity: 1, + left: "21%", + }, {duration: 500, queue: false }); + jQuery('.b-platevisual__plates--right').animate({ + opacity: 1, + left: "79%", + }, {duration: 500, queue: false }); + } //plate calulation function @@ -109,46 +109,16 @@ function animatePlatesIn () { //replaces and animates html for plates required to bar. //if statment works but need to figureout how to step animation. if (jQuery('.b-platevisual__plate').length > 0) { - console.log("If Statment Fired") //animates plates off - /*jQuery('.b-platevisual__plates--left').animate({ - opacity: 0, - left: "-16%", - }, {duration: 500, queue: false }); - jQuery('.b-platevisual__plates--right').animate({ - opacity: 0, - left: "116%", - }, {duration: 500, queue: false }); - //updates plates - jQuery(".b-platevisual__plates").html(weighthtml); - //animates plates back on - jQuery('.b-platevisual__plates--left').animate({ - opacity: 1, - left: "21%", - }, {duration: 500, queue: false }); - jQuery('.b-platevisual__plates--right').animate({ - opacity: 1, - left: "79%", - }, {duration: 500, queue: false });*/ - //animates plates off animatePlatesOut(); //updates plates jQuery(".b-platevisual__plates").html(weighthtml); //animates plates back on - setTimeout(animatePlatesIn(), 250); + setTimeout(animatePlatesIn, 500); } else { //updates plates jQuery(".b-platevisual__plates").html(weighthtml); //animates plates back on - /*jQuery('.b-platevisual__plates--left').animate({ - opacity: 1, - left: "21%", - }, {duration: 500, queue: false }); - jQuery('.b-platevisual__plates--right').animate({ - opacity: 1, - left: "79%", - }, {duration: 500, queue: false });*/ - //animates plates back on animatePlatesIn(); } }