From 6628e2c89c18a39f01738e3acbdaf5302295f2d1 Mon Sep 17 00:00:00 2001 From: Neil Brommer Date: Sun, 31 Dec 2017 15:52:48 -0800 Subject: [PATCH] Simplify calcBackground --- js/main.js | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/js/main.js b/js/main.js index 8959551..a64ed81 100644 --- a/js/main.js +++ b/js/main.js @@ -1,6 +1,14 @@ // use this when making changes so that there is no need to parse the page -var backgroundList = ["img/1.png", "img/2.png", "img/3.png", "img/4.png", - "img/5.png", "img/6.png", "img/7.png", "img/8.png"]; +var backgroundList = [ + {address: "img/1.png", dark: false}, + {address: "img/2.png", dark: false}, + {address: "img/3.png", dark: false}, + {address: "img/4.png", dark: false}, + {address: "img/5.png", dark: false}, + {address: "img/6.png", dark: true}, + {address: "img/7.png", dark: true}, + {address: "img/8.png", dark: true} +]; $(document).ready(function () { calcBackground(); @@ -14,30 +22,16 @@ function calcBackground() { var mins = now.getMinutes(); var total = (hours * 60) + mins; - // 24*60 = 1440 - // 2:40 between each step - if (total > 300 && total < 460) // 5:00 - 7:40 - setBackground(0, false); - else if (total > 460 && total < 620) - setBackground(1, false); - else if (total > 620 && total < 780) - setBackground(2, false); - else if (total > 780 && total < 940) - setBackground(3, false); - else if (total > 940 && total < 1100) - setBackground(4, false); - else if (total > 1100 && total < 1260) - setBackground(5, true); - else if (total > 1260 && total < 1420) - setBackground(6, true); - else - setBackground(7, true); + var period = (24 / backgroundList.length) * 60; // in minutes + + var background = backgroundList[Math.floor(total / period)]; + setBackground(background.address, background.dark); } } -function setBackground(num, dark) { +function setBackground(address, dark) { // dark is a boolean that indicates the brightness of the background - $("body").css("background-image", "url(" + backgroundList[num] + ")"); + $("body").css("background-image", "url(" + address + ")"); if (dark) { $(".navbar").removeClass("navbar-dark").addClass("navbar-light");