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

FIX: Use named params correctly with dir-span (#14203)

Browse Source
This commit is contained in:
Blake Erickson 2021-09-01 07:58:26 -06:00 committed by GitHub
parent a2ca430068
commit 0e62602fbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/helpers/dir-span.js
View File

@ -16,7 +16,7 @@ function setDir(text) {
export default registerUnbound("dir-span", function (str, params = {}) { export default registerUnbound("dir-span", function (str, params = {}) {
let isHtmlSafe = false; let isHtmlSafe = false;
if (params.htmlSafe) { if (params.htmlSafe) {
isHtmlSafe = params.htmlSafe; isHtmlSafe = params.htmlSafe === "true";
} }
let text = isHtmlSafe ? str : escapeExpression(str); let text = isHtmlSafe ? str : escapeExpression(str);
return htmlSafe(setDir(text)); return htmlSafe(setDir(text));

2
app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
View File

@ -5,7 +5,7 @@
{{category-title-link category=category}} {{category-title-link category=category}}
{{#if category.description_excerpt}} {{#if category.description_excerpt}}
<div class="category-description"> <div class="category-description">
{{dir-span category.description_excerpt htmlSafe=true}} {{dir-span category.description_excerpt htmlSafe="true"}}
</div> </div>
{{/if}} {{/if}}
{{#if category.isGrandParent}} {{#if category.isGrandParent}}

2
app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs
View File

@ -4,7 +4,7 @@
{{category-title-link tagName="h4" category=category}} {{category-title-link tagName="h4" category=category}}
{{#if category.description_excerpt}} {{#if category.description_excerpt}}
<div class="category-description subcategory-description"> <div class="category-description subcategory-description">
{{dir-span category.description_excerpt htmlSafe=true}} {{dir-span category.description_excerpt htmlSafe="true"}}
</div> </div>
{{/if}} {{/if}}
{{#if category.subcategories}} {{#if category.subcategories}}

2
app/assets/javascripts/discourse/app/templates/list/topic-excerpt.hbr
View File

@ -1,6 +1,6 @@
{{#if topic.hasExcerpt}} {{#if topic.hasExcerpt}}
<a href="{{topic.url}}" class="topic-excerpt"> <a href="{{topic.url}}" class="topic-excerpt">
{{dir-span topic.escapedExcerpt htmlSafe=true}} {{dir-span topic.escapedExcerpt htmlSafe="true"}}
{{#if topic.excerptTruncated}} {{#if topic.excerptTruncated}}
<span class="topic-excerpt-more">{{i18n 'read_more'}}</span> <span class="topic-excerpt-more">{{i18n 'read_more'}}</span>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/app/templates/navigation/category.hbs
View File

@ -11,7 +11,7 @@
}} }}
{{#if category.description}} {{#if category.description}}
<p>{{dir-span category.description htmlSafe=true}}</p> <p>{{dir-span category.description htmlSafe="true"}}</p>
{{/if}} {{/if}}
{{/if}} {{/if}}

2
app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
View File

@ -9,7 +9,7 @@
</div> </div>
{{#if shouldDisplayDescription}} {{#if shouldDisplayDescription}}
<div class="category-desc" aria-hidden="true">{{dir-span description htmlSafe=true}}</div> <div class="category-desc" aria-hidden="true">{{dir-span description htmlSafe="true"}}</div>
{{/if}} {{/if}}
{{else}} {{else}}
{{html-safe label}} {{html-safe label}}