olinpin/twitter-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into sortby

Browse Source
This commit is contained in:
Tim Wijma
2022-11-03 15:55:40 +01:00
parent 25254cd2fc 6bcdaf7d8c
commit dd357e8060
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dashboard_static/js/events.js
View File

@@ -72,7 +72,7 @@ $(window).on("filter", function() {
tweets = filterTweets(tweets, filters.blockedWords, filters.searchedWords.concat(filters.sports), filters.sorted, filters.order); tweets = filterTweets(tweets, filters.blockedWords, filters.searchedWords.concat(filters.sports), filters.sorted, filters.order);
tweets = sortTweets(tweets, [filters.sorted, filters.order]); tweets = sortTweets(tweets, [filters.sorted, filters.order]);
var displayTweets = tweets.reverse().slice(0, 20).reverse(); var displayTweets = tweets.reverse().slice(0, 20).reverse();
for (i = 0; i < 19; i++){ for (i = 0; i < Math.min(19, displayTweets.length); i++){
tweet = displayTweets[i]; tweet = displayTweets[i];
parent.prepend(tweetCell(tweet)); parent.prepend(tweetCell(tweet));
} }

2
dashboard_static/lib/tweets.js
View File

@@ -90,7 +90,7 @@ block.fn.tweets = function(config) {
// remove tweets // remove tweets
$list.replaceChildren(); $list.replaceChildren();
var displayTweets = tweets.reverse().slice(0, options.memory).reverse(); var displayTweets = tweets.reverse().slice(0, options.memory).reverse();
for (i = 0; i < options.memory-1; i++){ for (i = 0; i < Math.min(options.memory-1, displayTweets.length); i++){
$list.prepend(tweetCell(displayTweets[i])); $list.prepend(tweetCell(displayTweets[i]));
} }