Skip to content

Commit

Permalink
client: Rename dbs’ reloadList functions
Browse files Browse the repository at this point in the history
They do not actually trigger the reload of the list but only return the entries for EntriesPage.
They do reload some views like sidebars. Hopefully, we will be able to get rid of that in the future as well (e.g. using Redux).
  • Loading branch information
jtojnar committed May 30, 2021
1 parent 4b26c64 commit f71a50f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion assets/js/selfoss-db-offline.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ selfoss.dbOffline = {
},


reloadList: function(fetchParams) {
getEntries: function(fetchParams) {
let hasMore = false;
return selfoss.dbOffline._tr('r', selfoss.db.storage.entries,
function() {
Expand Down
4 changes: 2 additions & 2 deletions assets/js/selfoss-db-online.js
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ selfoss.dbOnline = {
*
* @return void
*/
reloadList: function(fetchParams, abortController) {
getEntries: function(fetchParams, abortController) {
return itemsRequests.getItems({
...fetchParams,
itemsPerPage: selfoss.config.itemsPerPage
Expand Down Expand Up @@ -263,7 +263,7 @@ selfoss.dbOnline = {
}

return selfoss.handleAjaxError(error).then(function() {
return selfoss.dbOffline.reloadList(fetchParams);
return selfoss.dbOffline.getEntries(fetchParams);
});
});
}
Expand Down
6 changes: 3 additions & 3 deletions assets/js/templates/EntriesPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ function reloadList({ fetchParams, abortController, append = false, waitForSync
return Promise.resolve();
}

let reloader = selfoss.dbOffline.reloadList;
let reloader = selfoss.dbOffline.getEntries;

// tag, source and search filtering not supported offline (yet?)
if (fetchParams.tag || fetchParams.source || fetchParams.search) {
reloader = selfoss.dbOnline.reloadList;
reloader = selfoss.dbOnline.getEntries;
}

var forceLoadOnline = selfoss.dbOffline.olderEntriesOnline || selfoss.dbOffline.shouldLoadEntriesOnline;
if (!selfoss.db.enableOffline.value || (selfoss.db.online && forceLoadOnline)) {
reloader = selfoss.dbOnline.reloadList;
reloader = selfoss.dbOnline.getEntries;
}

// Clean state when not just adding items.
Expand Down

0 comments on commit f71a50f

Please sign in to comment.