From fe5d2c73917a25216526927c45fec656d0da7847 Mon Sep 17 00:00:00 2001 From: ENGO150 Date: Wed, 8 May 2024 10:13:50 +0200 Subject: [PATCH] remade slideshow logic --- res/index/script.js | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/res/index/script.js b/res/index/script.js index 71d4725..0862289 100644 --- a/res/index/script.js +++ b/res/index/script.js @@ -1,37 +1,25 @@ //let imgs_index = [ 59, 58, 56, 55, 54, 67, 66, 64, 61, 60 ]; let imgs_index = [ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63 ]; -let imgs_index_2 = []; -let last_index = -1; +let last_index = imgs_index.length - 1; let login_clicked = false; let register_clicked = false; function change_slideshow_img() { - let buffer = (imgs_index == undefined || imgs_index.length == 0) ? imgs_index_2 : imgs_index; - let random_index = 5; - - do + if (last_index == imgs_index.length - 1) { - random_index = Math.floor(Math.random() * buffer.length); - //console.log("A"); - } while (buffer[random_index] == last_index); + let first_index = imgs_index[0]; - document.getElementById("slideshow").src = "http://109.123.243.163/fht/fabrika_imgs/downscaled/" + buffer[random_index] + ".jpg"; + do + { + imgs_index.sort(() => Math.random() - 0.5); + } while (first_index == imgs_index[0]); - if (imgs_index.includes(buffer[random_index])) - { - imgs_index_2.push(buffer[random_index]); - imgs_index.splice(random_index, 1); - } else - { - imgs_index.push(buffer[random_index]); - imgs_index_2.splice(random_index, 1); + last_index = 0; } - //console.log(buffer[random_index] + "\n" + last_index + "\n\n"); - - last_index = buffer[random_index]; + document.getElementById("slideshow").src = "http://109.123.243.163/fht/fabrika_imgs/downscaled/" + imgs_index[last_index++] + ".jpg"; } function repeat_panorama()