Merge branch 'main' into filterFee

This commit is contained in:
Tim Wijma
2022-11-03 17:17:09 +01:00
7 changed files with 93 additions and 30 deletions

View File

@@ -43,7 +43,6 @@ let root = document.querySelector(":root")
$(".logo").on("click", function() {
if (root.style.getPropertyValue("--main-bg") === 'snow') {
console.log("IM here")
var audio = new Audio("../media/Chicken.mp3");
audio.play();
root.style.setProperty('--main-medium-dark', '#1E1E1E');
@@ -66,16 +65,19 @@ $(".logo").on("click", function() {
$(window).on("filter", function() {
var parent = document.querySelector("#filtered")
parent.replaceChildren();
var lastTweet = parent.firstChild
tweets = window.sessionStorage.getItem('tweets');
tweets = JSON.parse(tweets);
tweets = filterTweets(tweets, filters.blockedWords, filters.searchedWords.concat(filters.sports), filters.sorted, filters.order);
tweets = sortTweets(tweets, [filters.sorted, filters.order]);
tweets = sortTweets(tweets, {"sortby":filters.sorted, "order":filters.order});
var displayTweets = tweets.reverse().slice(0, 20).reverse();
for (i = 0; i < Math.min(19, displayTweets.length); i++){
tweet = displayTweets[i];
parent.prepend(tweetCell(tweet));
if(tweetCell(displayTweets[0]) != lastTweet){
parent.replaceChildren();
for (i = 0; i < Math.min(19, displayTweets.length); i++){
tweet = displayTweets[i];
parent.prepend(tweetCell(tweet));
}
}
})