From 2afb95fe3e5dc82bda23166e6d38b81ed5d69a0c Mon Sep 17 00:00:00 2001 From: Kane York Date: Thu, 26 Mar 2020 11:56:42 -0700 Subject: [PATCH] DEV: Enable and fix the 'no-multiple-empty-lines' lint --- .template-lintrc.js | 2 +- app/assets/javascripts/admin/templates/admin.hbs | 2 -- .../admin/templates/components/admin-theme-editor.hbs | 1 - .../javascripts/admin/templates/components/themes-list.hbs | 2 -- app/assets/javascripts/admin/templates/plugins-index.hbs | 3 --- .../discourse/templates/components/image-uploader.hbs | 1 - .../javascripts/discourse/templates/components/share-popup.hbs | 1 - .../javascripts/discourse/templates/preferences/account.hbs | 2 -- .../javascripts/discourse/templates/preferences/categories.hbs | 2 -- .../javascripts/discourse/templates/preferences/interface.hbs | 1 - .../javascripts/discourse/templates/preferences/profile.hbs | 1 - .../javascripts/discourse/templates/preferences/users.hbs | 1 - app/assets/javascripts/discourse/templates/topic.hbs | 1 - 13 files changed, 1 insertion(+), 19 deletions(-) diff --git a/.template-lintrc.js b/.template-lintrc.js index 0a26ee1992d..1f377ea0f14 100644 --- a/.template-lintrc.js +++ b/.template-lintrc.js @@ -30,7 +30,7 @@ module.exports = { "no-log": true, "no-negated-condition": true, "no-nested-interactive": true, - "no-multiple-empty-lines": false, + "no-multiple-empty-lines": true, "no-obsolete-elements": true, "no-outlet-outside-routes": true, "no-partial": true, diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs index aec3433a0b1..2396114db65 100644 --- a/app/assets/javascripts/admin/templates/admin.hbs +++ b/app/assets/javascripts/admin/templates/admin.hbs @@ -29,11 +29,9 @@ {{/if}} {{nav-item route='adminPlugins' label='admin.plugins.title'}} {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}} - -
{{outlet}} 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 ad669f4d3de..ba31c888c32 100644 --- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs @@ -87,7 +87,6 @@
- {{#if error}}
{{error}}
{{/if}} diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs index 4654371a234..2bfbc8843b4 100644 --- a/app/assets/javascripts/admin/templates/components/themes-list.hbs +++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs @@ -44,8 +44,6 @@ {{i18n "admin.customize.theme.empty"}}
{{/if}} - -
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs index 9370d8457c5..d3d7c23785e 100644 --- a/app/assets/javascripts/admin/templates/plugins-index.hbs +++ b/app/assets/javascripts/admin/templates/plugins-index.hbs @@ -1,9 +1,6 @@ {{#if model.length}} - -

{{i18n "admin.plugins.installed"}}

- diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs index bf75d0929ad..9820cb33a09 100644 --- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs +++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs @@ -29,7 +29,6 @@ {{i18n 'upload_selector.uploading'}} {{uploadProgress}}% - {{#if imageUrl}} {{/if}} - {{d-button action="close" class="btn btn-flat close" icon="times" aria-label="share.close" title="share.close"}} diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs index 3f02b152380..70b8d20cd82 100644 --- a/app/assets/javascripts/discourse/templates/preferences/account.hbs +++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs @@ -165,7 +165,6 @@ {{/if}} - {{#if canCheckEmails}}
@@ -218,7 +217,6 @@ {{save-controls model=model action=(action "save") saved=saved}} {{/if}} - {{#if model.canDeleteAccount}}
{{i18n 'user.watched_categories_instructions'}}
-
{{#if canSee}} @@ -28,7 +27,6 @@
{{i18n 'user.tracked_categories_instructions'}}
-
{{category-selector diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs index 338a7d883e8..acd5aa60bb6 100644 --- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs +++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs @@ -54,7 +54,6 @@
{{/if}} -
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs index fded99a5fd6..fed0da9e91a 100644 --- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs +++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs @@ -87,7 +87,6 @@
{{/if}} - {{plugin-outlet name="user-preferences-profile" args=(hash model=model save=(action "save"))}} {{plugin-outlet name="user-custom-preferences" args=(hash model=model)}} diff --git a/app/assets/javascripts/discourse/templates/preferences/users.hbs b/app/assets/javascripts/discourse/templates/preferences/users.hbs index d4c183c3a07..799b9c5c5a8 100644 --- a/app/assets/javascripts/discourse/templates/preferences/users.hbs +++ b/app/assets/javascripts/discourse/templates/preferences/users.hbs @@ -27,5 +27,4 @@ {{plugin-outlet name="user-custom-controls" args=(hash model=model)}} - {{#save-controls model=model action=(action "save") saved=saved}}{{/save-controls}} diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index c79b3da18a5..c6297b021d9 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -87,7 +87,6 @@ {{/topic-title}} {{/if}} -
{{selected-posts