Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: enforces ember-template-lint: simple-unless (#9146)

This commit is contained in:
Joffrey JAFFEUX 2020-03-09 13:44:34 +01:00 committed by GitHub
parent 0e752db411
commit 4f37233208
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 60 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.template-lintrc.js
View File

@ -9,6 +9,7 @@ module.exports = {
"no-invalid-interactive": true,
"link-rel-noopener": true,
"no-unnecessary-concat": true,
"no-unused-block-params": true
"no-unused-block-params": true,
"simple-unless": true
}
};

46
app/assets/javascripts/admin/templates/components/admin-report.hbs
View File

@ -58,7 +58,28 @@
<div class="body">
<div class="main">
{{#unless showError}}
{{#if showError}}
{{#if showTimeoutError}}
<div class="alert alert-error report-alert timeout">
{{d-icon "exclamation-triangle"}}
<span>{{i18n "admin.dashboard.timeout_error"}}</span>
</div>
{{/if}}
{{#if showExceptionError}}
<div class="alert alert-error report-alert exception">
{{d-icon "exclamation-triangle"}}
<span>{{i18n "admin.dashboard.exception_error"}}</span>
</div>
{{/if}}
{{#if showNotFoundError}}
<div class="alert alert-error report-alert not-found">
{{d-icon "exclamation-triangle"}}
<span>{{i18n "admin.dashboard.not_found_error"}}</span>
</div>
{{/if}}
{{else}}
{{#if hasData}}
{{#if currentMode}}
{{component modeComponent model=model options=options}}
@ -91,28 +112,7 @@
</div>
{{/if}}
{{/if}}
{{else}}
{{#if showTimeoutError}}
<div class="alert alert-error report-alert timeout">
{{d-icon "exclamation-triangle"}}
<span>{{i18n "admin.dashboard.timeout_error"}}</span>
</div>
{{/if}}
{{#if showExceptionError}}
<div class="alert alert-error report-alert exception">
{{d-icon "exclamation-triangle"}}
<span>{{i18n "admin.dashboard.exception_error"}}</span>
</div>
{{/if}}
{{#if showNotFoundError}}
<div class="alert alert-error report-alert not-found">
{{d-icon "exclamation-triangle"}}
<span>{{i18n "admin.dashboard.not_found_error"}}</span>
</div>
{{/if}}
{{/unless}}
{{/if}}
</div>
{{#if showFilteringUI}}

8
app/assets/javascripts/admin/templates/components/themes-list-item.hbs
View File

@ -7,7 +7,9 @@
</span>
<span class="icons">
{{#unless theme.selected}}
{{#if theme.selected}}
{{d-icon "caret-right"}}
{{else}}
{{#if theme.default}}
{{d-icon "check" class="default-indicator" title="admin.customize.theme.default_theme_tooltip"}}
{{/if}}
@ -20,9 +22,7 @@
{{#unless theme.enabled}}
{{d-icon "ban" class="light-grey-icon" title="admin.customize.theme.disabled_component_tooltip"}}
{{/unless}}
{{else}}
{{d-icon "caret-right"}}
{{/unless}}
{{/if}}
</span>
</div>

18
app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
View File

@ -76,7 +76,14 @@
{{/if}}
</td>
<td class="col actions">
{{#unless item.editing}}
{{#if item.editing}}
{{d-button
class="btn-default"
action=(action "save")
actionParam=item
label="admin.logs.save"}}
<a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
{{else}}
{{d-button
class="btn-default btn-danger"
action=(action "destroy")
@ -102,14 +109,7 @@
icon="ban"
label="admin.logs.screened_ips.actions.block"}}
{{/if}}
{{else}}
{{d-button
class="btn-default"
action=(action "save")
actionParam=item
label="admin.logs.save"}}
<a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
{{/unless}}
{{/if}}
</td>
</tr>
{{/each}}

8
app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
View File

@ -52,13 +52,13 @@
{{/if}}
</h1>
{{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=''}}
{{#unless nameFirst}}
{{#if nameFirst}}
<h2 class='username'>{{username}}</h2>
{{else}}
{{#if user.name}}
<h2 class='full-name'>{{user.name}}</h2>
{{/if}}
{{else}}
<h2 class='username'>{{username}}</h2>
{{/unless}}
{{/if}}
{{#if user.title}}
<h2>{{user.title}}</h2>
{{/if}}

8
app/assets/javascripts/discourse/templates/full-page-search.hbs
View File

@ -67,7 +67,9 @@
{{plugin-outlet name="full-page-search-below-search-info" args=(hash search=searchTerm)}}
{{#unless searching}}
{{#if searching}}
{{loading-spinner size="medium"}}
{{else}}
<div class="search-results">
{{#load-more selector=".fps-result" action=(action "loadMore")}}
{{#each model.posts as |result|}}
@ -172,9 +174,7 @@
{{/conditional-loading-spinner}}
{{/load-more}}
</div>
{{else}}
{{loading-spinner size="medium"}}
{{/unless}}
{{/if}}
</div>
<div class="search-advanced-sidebar">

12
app/assets/javascripts/select-kit/templates/components/multi-select.hbs
View File

@ -7,7 +7,11 @@
}}
{{#select-kit/select-kit-body selectKit=selectKit}}
{{#unless selectKit.isLoading}}
{{#if selectKit.isLoading}}
<span class="is-loading">
{{loading-spinner size="small"}}
</span>
{{else}}
{{#if selectKit.filter}}
{{#if selectKit.hasNoContent}}
<span class="no-content">
@ -23,11 +27,7 @@
value=value
}}
{{/each}}
{{else}}
<span class="is-loading">
{{loading-spinner size="small"}}
</span>
{{/unless}}
{{/if}}
{{/select-kit/select-kit-body}}
<div class="select-kit-wrapper"></div>

16
app/assets/javascripts/select-kit/templates/components/single-select.hbs
View File

@ -9,7 +9,13 @@
{{#select-kit/select-kit-body selectKit=selectKit}}
{{component selectKit.options.filterComponent selectKit=selectKit}}
{{#unless selectKit.isLoading}}
{{#if selectKit.isLoading}}
<span class="is-loading">
{{#if site}}
{{loading-spinner size="small"}}
{{/if}}
</span>
{{else}}
{{#if selectKit.filter}}
{{#if selectKit.hasNoContent}}
<span class="no-content">
@ -25,13 +31,7 @@
value=value
}}
{{/each}}
{{else}}
<span class="is-loading">
{{#if site}}
{{loading-spinner size="small"}}
{{/if}}
</span>
{{/unless}}
{{/if}}
{{/select-kit/select-kit-body}}
<div class="select-kit-wrapper"></div>