Skip to content

Refactor (public/src/modules/topicList.js): reduce complexity in onTopicsLoaded #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
newperson1746 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Refactor (public/src/modules/topicList.js): reduce complexity in onTopicsLoaded #265

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6bc0ec6
Deduplicate check for !topics; move to helper
newperson1746 Sep 6, 2025
df83b5d
Insert print statement into refactored for test
newperson1746 Sep 6, 2025
ae45164
Move topics direction logic to helper function
newperson1746 Sep 6, 2025
4334c6a
Fix missing comma
newperson1746 Sep 6, 2025
c4f7469
Refactor html insertion logic into helper func
newperson1746 Sep 6, 2025
f545978
Remove debug print
newperson1746 Sep 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 32 additions & 26 deletions public/src/modules/topicList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,27 +187,44 @@ define('topicList', [
});
}

function onTopicsLoaded(templateName, topics, showSelect, direction, callback) {
function noTopics(topics, callback) {
if (!topics || !topics.length) {
$('#load-more-btn').hide();
return callback();
callback();
return true;
}
topics = filterTopicsOnDom(topics);
return false;
}

if (!topics.length) {
$('#load-more-btn').hide();
return callback();
}
function getInsertionPoints(direction, topicEls) {
return {
after: direction > 0 ? topicEls.last() : null,
before: direction < 0 ? topicEls.first() : null,
};
}

function insertHtml(html, after, before, topicListEl) {
if (after?.length) {
html.insertAfter(after);
} else if (before?.length) {
const height = $(document).height();
const scrollTop = $(window).scrollTop();

let after;
let before;
const topicEls = topicListEl.find('[component="category/topic"]');
html.insertBefore(before);

if (direction > 0 && topics.length) {
after = topicEls.last();
} else if (direction < 0 && topics.length) {
before = topicEls.first();
$(window).scrollTop(scrollTop + ($(document).height() - height));
} else {
topicListEl.append(html);
}
}

function onTopicsLoaded(templateName, topics, showSelect, direction, callback) {
if (noTopics(topics, callback)) return;
topics = filterTopicsOnDom(topics);

if (noTopics(topics, callback)) return;

const { after, before } = getInsertionPoints(direction, topicListEl.find('[component="category/topic"]'));

const tplData = {
topics: topics,
Expand All @@ -224,18 +241,7 @@ define('topicList', [
topicListEl.removeClass('hidden');
$('#category-no-topics').remove();

if (after && after.length) {
html.insertAfter(after);
} else if (before && before.length) {
const height = $(document).height();
const scrollTop = $(window).scrollTop();

html.insertBefore(before);

$(window).scrollTop(scrollTop + ($(document).height() - height));
} else {
topicListEl.append(html);
}
insertHtml(html, after, before, topicListEl);

if (!topicSelect.getSelectedTids().length) {
infinitescroll.removeExtra(topicListEl.find('[component="category/topic"]'), direction, Math.max(60, config.topicsPerPage * 3));
Expand Down