Permalink
Browse files

Do not animate unnecessarily when changing page on JS sorted results.

  • Loading branch information...
luccioman committed Sep 14, 2017
1 parent fb6743e commit 4e3c928d3159394e24594d2bba24bcc06c4d840f
Showing with 34 additions and 14 deletions.
  1. +5 −4 htroot/env/yacysort.css
  2. +29 −10 htroot/js/yacysort.js
@@ -1,13 +1,14 @@
/* Specific styling for search results resorting with JavaScript (configuration setting search.jsresort=true) */
/* Apply to all search results on the current page, except the last inserted one which doesn't need animation */
.searchresults.currentpage:not(:last-of-type) {
/* Apply to all freshly fetched search results on the current page, except the last inserted one which doesn't need animation */
.searchresults.currentpage.fresh:not(:last-of-type) {
/* Animate when a result becomes part of the currently displayed results page */
animation: 1s 1 forwards showSearchResult;
}
.searchresults.earlierpage, .searchresults.laterpage {
/* Animate when a result goes out of the currently displayed results page*/
/* Apply to all freshly fetched search results gone outside the current page */
.searchresults.earlierpage.fresh, .searchresults.laterpage.fresh {
/* Animate when a result goes out of the currently displayed results page */
animation: 1s 1 forwards hideSearchResult;
}
@@ -29,29 +29,48 @@ var logEnabled = false;
/* Indicates if the results feeders are running on the server */
var feedRunning = true;
var displayPage = function() {
/**
* Refresh the results page, checking each result CSS class depending on its position and ranking.
* @param isPageChange when true this refresh is done in response to a page change
*/
var displayPage = function(isPageChange) {
var offset = 1;
var totalcount = 0;
var itemscount = 0;
// For every search item that has already been displayed and sorted ...
$("#resultscontainer").find(".searchresults").each(function(i) {
var item = $(this);
var isFresh = item.hasClass("fresh");
if(isPageChange && isFresh) {
/* When changing page, remove the 'fresh' mark from all results,
* so that the related insertion/removal animations are not performed */
item.removeClass("fresh");
}
totalcount++;
var earlierPage = parseFloat($(this).data("ranking")) > highestRanking;
var earlierPage = parseFloat(item.data("ranking")) > highestRanking;
// Apply the "earlierpage" class IFF the item is from an earlier page.
$(this).toggleClass("earlierpage", earlierPage);
item.toggleClass("earlierpage", earlierPage);
if (earlierPage) {
$(this).removeClass("currentpage");
item.removeClass("currentpage");
if(!isFresh) {
/* Use the "hidden" CSS class when this item has not been recently inserted to hide it without unnecessary animation */
item.addClass("hidden");
}
offset++;
itemscount++;
} else {
var laterPage = ((i - offset + 1) >= requestedResults);
$(this).toggleClass("laterpage", laterPage);
item.toggleClass("laterpage", laterPage);
// If we now have too many results, hide the lowest-ranking ones.
if (laterPage) {
$(this).removeClass("currentpage");
item.removeClass("currentpage");
if(!isFresh) {
/* Use the "hidden" CSS class when this item has not been recently inserted to hide it without unnecessary animation */
item.addClass("hidden");
}
} else {
$(this).removeClass("hidden");
$(this).addClass("currentpage");
item.removeClass("hidden");
item.addClass("currentpage");
itemscount++;
}
}
@@ -102,7 +121,7 @@ var numberedPage = function(pageNumber) {
}
// Update the display to show the new page.
displayPage();
displayPage(true);
};
var processSidebarNavProtocols = function(navProtocolsOld, navProtocolsNew) {
@@ -292,7 +311,7 @@ var processLatestInfo = function(latestInfo) {
var processItem = function(data) {
var newItem = $(data);
newItem.addClass("hidden");
newItem.addClass("hidden fresh");
/* If we didn't get a valid response from YaCy, wait a bit and check if the results feeders are still running on the server side */
if( ! newItem.data("ranking") ) {

0 comments on commit 4e3c928

Please sign in to comment.