github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-21 01:25:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: properly add 'two-rows' class to header-topic-info container (#9497)

Browse Source
This commit is contained in:
Mark VanLandingham 2020-04-21 13:01:57 -05:00 committed by GitHub
parent a97cb2444c
commit 036236d6d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/assets/javascripts/discourse/widgets/header-topic-info.js
View File

@ -56,9 +56,12 @@ createWidget("topic-header-participant", {
export default createWidget("header-topic-info", {
tagName: "div.extra-info-wrapper",
contents: null,
title: null,
buildClasses(attrs) {
return this.showCategory(attrs.topic) ? "two-rows" : "";
buildClasses(attrs, state) {
this.buildAttributes(attrs, state);
return this.containerClassName();
},
buildFancyTitleClass() {
@ -73,7 +76,7 @@ export default createWidget("header-topic-info", {
.join(" ");
},
html(attrs, state) {
buildAttributes(attrs, state) {
const topic = attrs.topic;
const heading = [];
@ -112,11 +115,15 @@ export default createWidget("header-topic-info", {
);
}
const title = [h("h1.header-title", heading)];
this.title = [h("h1.header-title", heading)];
const category = topic.get("category");
if (loaded || category) {
if (this.showCategory(topic)) {
if (
category &&
(!category.isUncategorizedCategory ||
!this.siteSettings.suppress_uncategorized_badge)
) {
const parentCategory = category.get("parentCategory");
const categories = [];
if (parentCategory) {
@ -126,7 +133,7 @@ export default createWidget("header-topic-info", {
}
categories.push(this.attach("category-link", { category }));
title.push(h("div.categories-wrapper", categories));
this.title.push(h("div.categories-wrapper", categories));
}
let extra = [];
@ -196,24 +203,23 @@ export default createWidget("header-topic-info", {
}
}
if (extra.length) {
title.push(h("div.topic-header-extra", extra));
this.title.push(h("div.topic-header-extra", extra));
}
}
const contents = h("div.title-wrapper", title);
this.contents = h("div.title-wrapper", this.title);
},
html() {
return h(
"div.extra-info",
{ className: title.length > 1 ? "two-rows" : "" },
contents
{ className: this.containerClassName() },
this.contents
);
},
showCategory(topic) {
return (
topic.category &&
(!topic.category.isUncategorizedCategory ||
!this.siteSettings.suppress_uncategorized_badge)
);
containerClassName() {
return this.title.length > 1 ? "two-rows" : "";
},
jumpToTopPost() {