Skip to content

Commit e627066

Browse files
authored
Merge pull request #98 from luceos/master
Fixes tags page
2 parents fc400ea + ad2a2be commit e627066

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

js/dist/forum.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/dist/forum.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/src/forum/utils/extendTagOverview.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ import TagsPage from "flarum/tags/components/TagsPage";
44

55
export default function extendTagOverview() {
66
extend(TagsPage.prototype, "view", function (markup) {
7-
if (app.forum.attribute("blogHideTags") == false) return markup;
7+
// Pending xhr to load all tags, throw back loading indicator.
8+
if (this.loading) {
9+
return markup;
10+
}
11+
12+
if (app.forum.attribute("blogHideTags") === false) return markup;
813

914
// Get knowledge base tag ID's
1015
const knowledgeBaseTags = app.forum.attribute("blogTags") || [];
@@ -23,7 +28,7 @@ export default function extendTagOverview() {
2328
});
2429

2530
extend(IndexPage.prototype, "navItems", function (items) {
26-
if (app.forum.attribute("blogHideTags") == false) return items;
31+
if (app.forum.attribute("blogHideTags") === false) return items;
2732

2833
const blogTags = app.forum.attribute("blogTags") || [];
2934

0 commit comments

Comments
 (0)