From e9b6b0194c822bed5d21692798e0a12c6f49113c Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Sat, 7 Mar 2020 12:58:48 +0100 Subject: [PATCH] DEV: enforce ember-template-lint: no-unnecessary-concat (#9133) --- .template-lintrc.js | 3 ++- .../templates/components/admin-report-counters.hbs | 2 +- .../admin/templates/components/admin-report-counts.hbs | 2 +- .../templates/components/admin-report-inline-table.hbs | 2 +- .../components/admin-report-storage-stats.hbs | 2 +- .../admin/templates/components/admin-report-table.hbs | 2 +- .../admin/templates/components/admin-report.hbs | 10 +++++----- .../admin/templates/components/admin-theme-editor.hbs | 2 +- .../templates/components/admin-web-hook-event.hbs | 2 +- .../admin/templates/components/flag-user.hbs | 2 +- .../admin/templates/components/install-theme-item.hbs | 2 +- .../admin/templates/customize-themes-edit.hbs | 2 +- .../admin/templates/customize-themes-show.hbs | 10 +++++----- .../javascripts/admin/templates/dashboard_general.hbs | 2 +- .../admin/templates/dashboard_moderation.hbs | 2 +- .../javascripts/admin/templates/email-received.hbs | 2 +- app/assets/javascripts/admin/templates/email-sent.hbs | 2 +- .../javascripts/admin/templates/email-skipped.hbs | 2 +- app/assets/javascripts/admin/templates/emojis.hbs | 2 +- .../admin/templates/logs/staff-action-logs.hbs | 2 +- .../admin/templates/modal/admin-install-theme.hbs | 4 ++-- .../admin/templates/modal/admin-theme-item.hbs | 2 +- app/assets/javascripts/admin/templates/permalinks.hbs | 8 ++++---- .../javascripts/admin/templates/search-logs-term.hbs | 4 ++-- .../javascripts/admin/templates/site-settings.hbs | 2 +- app/assets/javascripts/admin/templates/user-badges.hbs | 2 +- app/assets/javascripts/admin/templates/user-index.hbs | 2 +- .../javascripts/admin/templates/users-list-show.hbs | 2 +- .../javascripts/admin/templates/watched-words.hbs | 2 +- .../javascripts/discourse/templates/badges/show.hbs | 2 +- .../templates/components/about-page-users.hbs | 6 +++--- .../discourse/templates/components/avatar-uploader.hbs | 2 +- .../discourse/templates/components/backup-uploader.hbs | 2 +- .../templates/components/categories-boxes-topic.hbs | 2 +- .../templates/components/categories-topic-list.hbs | 2 +- .../discourse/templates/components/category-unread.hbs | 4 ++-- .../templates/components/discourse-banner.hbs | 2 +- .../templates/components/edit-category-settings.hbs | 4 ++-- .../templates/components/edit-category-tab.hbs | 2 +- .../discourse/templates/components/featured-topic.hbs | 8 ++++---- .../discourse/templates/components/google-search.hbs | 4 ++-- .../templates/components/group-card-contents.hbs | 8 ++++---- .../templates/components/group-flair-inputs.hbs | 2 +- .../discourse/templates/components/group-post.hbs | 4 ++-- .../discourse/templates/components/images-uploader.hbs | 2 +- .../templates/components/latest-topic-list-item.hbs | 2 +- .../templates/components/mobile-category-topic.hbs | 2 +- .../discourse/templates/components/nav-item.hbs | 2 +- .../discourse/templates/components/share-source.hbs | 2 +- .../templates/components/topic-post-badges.hbs | 6 +++--- .../discourse/templates/components/topic-progress.hbs | 4 ++-- .../templates/components/topic-timer-info.hbs | 4 ++-- .../discourse/templates/components/user-badge.hbs | 2 +- .../templates/components/user-card-contents.hbs | 4 ++-- .../templates/components/user-fields/confirm.hbs | 2 +- .../templates/components/user-fields/dropdown.hbs | 2 +- .../templates/components/user-fields/text.hbs | 2 +- .../discourse/templates/components/user-info.hbs | 4 ++-- .../templates/components/user-stream-item.hbs | 2 +- .../templates/components/user-summary-topic.hbs | 2 +- .../javascripts/discourse/templates/composer.hbs | 10 +++++----- .../discourse/templates/full-page-search.hbs | 4 ++-- .../templates/mobile/components/basic-topic-list.hbs | 6 +++--- .../templates/mobile/components/categories-only.hbs | 6 +++--- .../javascripts/discourse/templates/modal/history.hbs | 4 ++-- .../discourse/templates/modal/insert-hyperlink.hbs | 4 ++-- .../discourse/templates/modal/reorder-categories.hbs | 2 +- .../javascripts/discourse/templates/password-reset.hbs | 2 +- .../discourse/templates/preferences/account.hbs | 2 +- .../discourse/templates/preferences/categories.hbs | 6 +++--- app/assets/javascripts/discourse/templates/topic.hbs | 10 +++++----- .../discourse/templates/user-invited-show.hbs | 4 ++-- app/assets/javascripts/discourse/templates/user.hbs | 4 ++-- .../wizard/templates/components/popular-themes.hbs | 2 +- 74 files changed, 125 insertions(+), 124 deletions(-) diff --git a/.template-lintrc.js b/.template-lintrc.js index 3a85b721b0e..f36c6313d2c 100644 --- a/.template-lintrc.js +++ b/.template-lintrc.js @@ -7,6 +7,7 @@ module.exports = { "table-groups": true, "style-concatenation": true, "no-invalid-interactive": true, - "link-rel-noopener": true + "link-rel-noopener": true, + "no-unnecessary-concat": true } }; diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs index 9f3882a3b49..05d456fdebb 100644 --- a/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs @@ -2,7 +2,7 @@ {{#if model.icon}} {{d-icon model.icon}} {{/if}} - {{model.title}} + {{model.title}}
{{number model.todayCount}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs index 4b4a406c597..a1e64441f9e 100644 --- a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs @@ -2,7 +2,7 @@ {{#if report.icon}} {{d-icon report.icon}} {{/if}} - {{report.title}} + {{report.title}} {{number report.todayCount}} diff --git a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs index 70138f829db..76c8eacb0be 100644 --- a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs @@ -1,6 +1,6 @@
{{#each model.data as |data|}} - + {{#if data.icon}} {{d-icon data.icon}} diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs index 054b91d7078..fbb9f80a64a 100644 --- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs @@ -1,7 +1,7 @@ {{#if showBackupStats}}

- {{d-icon "archive"}} {{i18n "admin.dashboard.backups"}} + {{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}

{{#if backupStats.free_bytes}} diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs index 6c7838e872e..f42189eb9a3 100644 --- a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs @@ -24,7 +24,7 @@ {{#if showTotalForSample}} - + {{i18n 'admin.dashboard.reports.totals_for_sample'}} diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs index cb0f333bb02..0c7009cc820 100644 --- a/app/assets/javascripts/admin/templates/components/admin-report.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs @@ -18,17 +18,17 @@ {{#unless showNotFoundError}}

  • - + {{model.title}} {{#if model.description}} {{#if model.description_link}} - + {{d-icon "question-circle"}} {{else}} - + {{d-icon "question-circle"}} {{/if}} @@ -40,7 +40,7 @@ {{#if shouldDisplayTrend}}
    - + {{#if model.average}} {{number model.currentAverage}}{{#if model.percent}}%{{/if}} {{else}} @@ -77,7 +77,7 @@
    {{d-icon "chart-pie"}} {{#if model.reportUrl}} - + {{#if model.title}} {{model.title}} — diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs index bf9d2fd3cbc..ad669f4d3de 100644 --- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs @@ -25,7 +25,7 @@ {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}} diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs index ce952f3ec72..11977f1398a 100644 --- a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs @@ -1,5 +1,5 @@
    - {{model.status}} + {{model.status}}
    {{model.id}}
    {{createdAt}}
    diff --git a/app/assets/javascripts/admin/templates/components/flag-user.hbs b/app/assets/javascripts/admin/templates/components/flag-user.hbs index 26087789e56..a6a4ce0f95e 100644 --- a/app/assets/javascripts/admin/templates/components/flag-user.hbs +++ b/app/assets/javascripts/admin/templates/components/flag-user.hbs @@ -7,7 +7,7 @@ {{#link-to 'adminUser' user.id user.username class="flag-user-username"}} {{user.username}} {{/link-to}} -
    +
    {{format-age date}}
    diff --git a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs index ed4ddd242f3..2697ffe8b92 100644 --- a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs +++ b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs @@ -1,5 +1,5 @@ {{radio-button name="install-items" id=value value=value selection=selection}} -