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

DEV: enforces no self-closing-void-elements (#8879)

This commit is contained in:
Joffrey JAFFEUX 2020-02-06 17:26:06 +01:00 committed by GitHub
parent 0fd39cc511
commit dafd3c3b47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.template-lintrc.js
View File

@ -1,8 +1,8 @@
module.exports = { module.exports = {
extends: "recommended", // extends: "recommended",
ignore: ["**/*.raw"], ignore: ["**/*.raw"],
rules: { rules: {
quotes: false "self-closing-void-elements": true
} }
}; };

2
app/assets/javascripts/admin/templates/badges-award.hbs
View File

@ -14,7 +14,7 @@
</div> </div>
<div> <div>
<h4>{{I18n 'admin.badges.mass_award.upload_csv'}}</h4> <h4>{{I18n 'admin.badges.mass_award.upload_csv'}}</h4>
<input type='file' id='massAwardCSVUpload' accept='.csv' /> <input type='file' id='massAwardCSVUpload' accept='.csv'>
</div> </div>
<div> <div>
<label> <label>

2
app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
View File

@ -45,7 +45,7 @@
<div class="row"> <div class="row">
<div class="form-display"> <div class="form-display">
<strong>{{userField.name}}</strong> <strong>{{userField.name}}</strong>
<br/> <br>
{{{userField.description}}} {{{userField.description}}}
</div> </div>
<div class="form-display">{{fieldName}}</div> <div class="form-display">{{fieldName}}</div>

2
app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs
View File

@ -1,7 +1,7 @@
{{#if field}} {{#if field}}
<section class="field"> <section class="field">
<b>{{i18n name}}</b>: ({{i18n 'character_count' count=field.length}}) <b>{{i18n name}}</b>: ({{i18n 'character_count' count=field.length}})
<br/> <br>
{{textarea value=field class="plain"}} {{textarea value=field class="plain"}}
</section> </section>
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/components/tags-uploader.hbs
View File

@ -1,6 +1,6 @@
<label class="btn {{if addDisabled 'disabled'}}"> <label class="btn {{if addDisabled 'disabled'}}">
{{d-icon "upload"}} {{d-icon "upload"}}
{{i18n 'admin.watched_words.form.upload'}} {{i18n 'admin.watched_words.form.upload'}}
<input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain,text/csv" /> <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain,text/csv">
</label> </label>
<span class="instructions">{{i18n 'tagging.upload_instructions'}}</span> <span class="instructions">{{i18n 'tagging.upload_instructions'}}</span>

2
app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
View File

@ -1,6 +1,6 @@
<label class="btn btn-default {{if addDisabled 'disabled'}}"> <label class="btn btn-default {{if addDisabled 'disabled'}}">
{{d-icon "upload"}} {{d-icon "upload"}}
{{i18n 'admin.watched_words.form.upload'}} {{i18n 'admin.watched_words.form.upload'}}
<input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain" /> <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain">
</label> </label>
<span class="instructions">{{i18n 'admin.watched_words.one_word_per_line'}}</span> <span class="instructions">{{i18n 'admin.watched_words.one_word_per_line'}}</span>

2
app/assets/javascripts/admin/templates/customize-colors-show.hbs
View File

@ -32,7 +32,7 @@
<span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span> <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
</div> </div>
<br/> <br>
<div class='admin-controls'> <div class='admin-controls'>
<div class='search controls'> <div class='search controls'>

4
app/assets/javascripts/admin/templates/email-advanced-test.hbs
View File

@ -11,13 +11,13 @@
{{#conditional-loading-spinner condition=loading}} {{#conditional-loading-spinner condition=loading}}
{{#if format}} {{#if format}}
<hr/> <hr>
<div class="text"> <div class="text">
<h3>{{i18n 'admin.email.advanced_test.text'}}</h3> <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
<pre class="full-reason">{{{text}}}</pre> <pre class="full-reason">{{{text}}}</pre>
</div> </div>
<hr/> <hr>
<div class="elided"> <div class="elided">
<h3>{{i18n 'admin.email.advanced_test.elided'}}</h3> <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
<pre class="full-reason">{{{elided}}}</pre> <pre class="full-reason">{{{elided}}}</pre>

2
app/assets/javascripts/admin/templates/permalinks.hbs
View File

@ -8,7 +8,7 @@
{{text-field value=filter class="url-input" placeholderKey="admin.permalink.form.filter" autocorrect="off" autocapitalize="off"}} {{text-field value=filter class="url-input" placeholderKey="admin.permalink.form.filter" autocorrect="off" autocapitalize="off"}}
</div> </div>
{{permalink-form action=(action "recordAdded")}} {{permalink-form action=(action "recordAdded")}}
<br/> <br>
{{#conditional-loading-spinner condition=loading}} {{#conditional-loading-spinner condition=loading}}
{{#if model.length}} {{#if model.length}}

2
app/assets/javascripts/admin/templates/site-settings-category.hbs
View File

@ -8,6 +8,6 @@
{{/if}} {{/if}}
{{/d-section}} {{/d-section}}
{{else}} {{else}}
<br/> <br>
{{i18n 'admin.site_settings.no_results'}} {{i18n 'admin.site_settings.no_results'}}
{{/if}} {{/if}}

4
app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
View File

@ -9,7 +9,7 @@
<div class="admin-container tl3-requirements"> <div class="admin-container tl3-requirements">
<h2>{{model.username}} - {{i18n 'admin.user.tl3_requirements.title'}}</h2> <h2>{{model.username}} - {{i18n 'admin.user.tl3_requirements.title'}}</h2>
<br/> <br>
<p>{{i18n 'admin.user.tl3_requirements.table_title' count=model.tl3Requirements.time_period}}</p> <p>{{i18n 'admin.user.tl3_requirements.table_title' count=model.tl3Requirements.time_period}}</p>
<table class="table" style="width: auto;"> <table class="table" style="width: auto;">
@ -111,7 +111,7 @@
</tbody> </tbody>
</table> </table>
<br/> <br>
<p> <p>
{{#if model.istl3}} {{#if model.istl3}}
{{#if model.tl3Requirements.requirements_lost}} {{#if model.tl3Requirements.requirements_lost}}

2
app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
View File

@ -6,7 +6,7 @@
{{i18n 'upload'}} {{i18n 'upload'}}
{{/if}} {{/if}}
<input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" /> <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
</label> </label>
{{#if imageIsNotASquare}} {{#if imageIsNotASquare}}

2
app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
View File

@ -1,4 +1,4 @@
<label class="btn" disabled={{uploading}} title="{{i18n 'admin.backups.upload.title'}}"> <label class="btn" disabled={{uploading}} title="{{i18n 'admin.backups.upload.title'}}">
{{d-icon "upload"}}&nbsp;{{uploadButtonText}} {{d-icon "upload"}}&nbsp;{{uploadButtonText}}
<input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".gz" /> <input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".gz">
</label> </label>

2
app/assets/javascripts/discourse/templates/components/color-input.hbs
View File

@ -1 +1 @@
{{text-field class="hex-input" value=hexValue maxlength="6"}} <input class="picker" type="input"/> {{text-field class="hex-input" value=hexValue maxlength="6"}} <input class="picker" type="input">

2
app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
View File

@ -1,6 +1,6 @@
<label class="btn" disabled={{uploadButtonDisabled}}> <label class="btn" disabled={{uploadButtonDisabled}}>
{{d-icon "upload"}}&nbsp;{{uploadButtonText}} {{d-icon "upload"}}&nbsp;{{uploadButtonText}}
<input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".csv" /> <input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".csv">
</label> </label>
{{#if uploading}} {{#if uploading}}
<span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span> <span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>

2
app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
View File

@ -7,5 +7,5 @@
class="hidden-upload-field" class="hidden-upload-field"
disabled={{addDisabled}} disabled={{addDisabled}}
type="file" type="file"
accept=".png,.gif" /> accept=".png,.gif">
</label> </label>

2
app/assets/javascripts/discourse/templates/components/image-uploader.hbs
View File

@ -5,7 +5,7 @@
<div class="image-upload-controls"> <div class="image-upload-controls">
<label class="btn btn-default pad-left no-text {{if uploading 'disabled'}}"> <label class="btn btn-default pad-left no-text {{if uploading 'disabled'}}">
{{d-icon "far-image"}} {{d-icon "far-image"}}
<input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" /> <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
</label> </label>
{{#if imageUrl}} {{#if imageUrl}}

2
app/assets/javascripts/discourse/templates/components/images-uploader.hbs
View File

@ -1,6 +1,6 @@
<label class="btn" disabled={{uploading}} title="{{i18n "admin.site_settings.uploaded_image_list.upload.title"}}"> <label class="btn" disabled={{uploading}} title="{{i18n "admin.site_settings.uploaded_image_list.upload.title"}}">
{{d-icon "far-image"}}&nbsp;{{uploadButtonText}} {{d-icon "far-image"}}&nbsp;{{uploadButtonText}}
<input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" multiple /> <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" multiple>
</label> </label>
{{#if uploading}} {{#if uploading}}
<span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span> <span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>

4
app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
View File

@ -1,9 +1,9 @@
<div class="tag-group-content"> <div class="tag-group-content">
<h1>{{text-field value=buffered.name}}</h1> <h1>{{text-field value=buffered.name}}</h1>
<br/> <br>
<section class="group-tags-list"> <section class="group-tags-list">
<label>{{i18n 'tagging.groups.tags_label'}}</label><br/> <label>{{i18n 'tagging.groups.tags_label'}}</label><br>
{{tag-chooser {{tag-chooser
tags=buffered.tag_names tags=buffered.tag_names
everyTag=true everyTag=true

2
app/assets/javascripts/discourse/templates/components/tag-info.hbs
View File

@ -16,7 +16,7 @@
{{/if}} {{/if}}
{{#if tagInfo.categories}} {{#if tagInfo.categories}}
{{categoriesInfo}} {{categoriesInfo}}
<br/> <br>
{{#each tagInfo.categories as |category|}} {{#each tagInfo.categories as |category|}}
{{category-link category}} {{category-link category}}
{{/each}} {{/each}}

2
app/assets/javascripts/discourse/templates/components/tag-list.hbs
View File

@ -12,4 +12,4 @@
{{discourse-tag tag.id isPrivateMessage=isPrivateMessage pmOnly=tag.pmOnly tagsForUser=tagsForUser}} {{#if tag.pmOnly}}{{d-icon "far-envelope"}}{{/if}}{{#if tag.totalCount}} <span class='tag-count'>x {{tag.totalCount}}</span>{{/if}} {{discourse-tag tag.id isPrivateMessage=isPrivateMessage pmOnly=tag.pmOnly tagsForUser=tagsForUser}} {{#if tag.pmOnly}}{{d-icon "far-envelope"}}{{/if}}{{#if tag.totalCount}} <span class='tag-count'>x {{tag.totalCount}}</span>{{/if}}
</div> </div>
{{/each}} {{/each}}
<div class="clearfix" /> <div class="clearfix"></div>

2
app/assets/javascripts/discourse/templates/groups/new.hbs
View File

@ -1,7 +1,7 @@
{{#d-section pageClass="groups-new"}} {{#d-section pageClass="groups-new"}}
<h1>{{i18n "admin.groups.new.title"}}</h1> <h1>{{i18n "admin.groups.new.title"}}</h1>
<hr/> <hr>
<form class="groups-form form-vertical"> <form class="groups-form form-vertical">
{{#groups-form-profile-fields model=model disableSave=saving}} {{#groups-form-profile-fields model=model disableSave=saving}}

4
app/assets/javascripts/discourse/templates/invites/show.hbs
View File

@ -9,7 +9,7 @@
<div class="col-form"> <div class="col-form">
{{#if successMessage}} {{#if successMessage}}
<br/><br/> <br><br>
<div class='alert alert-info'><p>{{{successMessage}}}</p></div> <div class='alert alert-info'><p>{{{successMessage}}}</p></div>
{{else}} {{else}}
<p>{{i18n 'invites.invited_by'}}</p> <p>{{i18n 'invites.invited_by'}}</p>
@ -64,7 +64,7 @@
label="invites.accept_invite"}} label="invites.accept_invite"}}
{{#if errorMessage}} {{#if errorMessage}}
<br/><br/> <br><br>
<div class='alert alert-error'>{{errorMessage}}</div> <div class='alert alert-error'>{{errorMessage}}</div>
{{/if}} {{/if}}
</form> </form>

2
app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
View File

@ -13,7 +13,7 @@
<span class="text"> <span class="text">
{{i18n "topic.progress.jump_prompt_or"}} {{i18n "topic.progress.jump_prompt_or"}}
</span> </span>
<hr class="right" /> <hr class="right">
</div> </div>
<div class="jump-to-date-control"> <div class="jump-to-date-control">

2
app/assets/javascripts/discourse/templates/password-reset.hbs
View File

@ -19,7 +19,7 @@
{{#if securityKeyOrSecondFactorRequired }} {{#if securityKeyOrSecondFactorRequired }}
{{#if errorMessage}} {{#if errorMessage}}
<div class='alert alert-error'>{{errorMessage}}</div> <div class='alert alert-error'>{{errorMessage}}</div>
<br/> <br>
{{/if}} {{/if}}
{{#if securityKeyRequired }} {{#if securityKeyRequired }}
{{#security-key-form {{#security-key-form

4
app/assets/javascripts/discourse/templates/preferences/account.hbs
View File

@ -208,7 +208,7 @@
{{plugin-outlet name="user-preferences-account" args=(hash model=model save=(action "save"))}} {{plugin-outlet name="user-preferences-account" args=(hash model=model save=(action "save"))}}
<br/> <br>
{{plugin-outlet name="user-custom-controls" args=(hash model=model)}} {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
@ -223,7 +223,7 @@
{{#if model.canDeleteAccount}} {{#if model.canDeleteAccount}}
<div class="control-group delete-account"> <div class="control-group delete-account">
<br/> <br>
<div class="controls"> <div class="controls">
{{d-button action=(action "delete") disabled=deleteDisabled class="btn-danger" icon="far-trash-alt" label="user.delete_account"}} {{d-button action=(action "delete") disabled=deleteDisabled class="btn-danger" icon="far-trash-alt" label="user.delete_account"}}
</div> </div>

2
app/assets/javascripts/discourse/templates/preferences/categories.hbs
View File

@ -57,7 +57,7 @@
{{plugin-outlet name="user-preferences-categories" args=(hash model=model save=(action "save"))}} {{plugin-outlet name="user-preferences-categories" args=(hash model=model save=(action "save"))}}
<br/> <br>
{{plugin-outlet name="user-custom-controls" args=(hash model=model)}} {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}

2
app/assets/javascripts/discourse/templates/preferences/emails.hbs
View File

@ -89,7 +89,7 @@
{{plugin-outlet name="user-preferences-emails" args=(hash model=model save=(action "save"))}} {{plugin-outlet name="user-preferences-emails" args=(hash model=model save=(action "save"))}}
<br/> <br>
{{plugin-outlet name="user-custom-controls" args=(hash model=model)}} {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}

2
app/assets/javascripts/discourse/templates/preferences/interface.hbs
View File

@ -95,7 +95,7 @@
{{plugin-outlet name="user-preferences-interface" args=(hash model=model save=(action "save"))}} {{plugin-outlet name="user-preferences-interface" args=(hash model=model save=(action "save"))}}
<br/> <br>
{{plugin-outlet name="user-custom-controls" args=(hash model=model)}} {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}

2
app/assets/javascripts/discourse/templates/preferences/notifications.hbs
View File

@ -64,7 +64,7 @@
{{plugin-outlet name="user-preferences-notifications" args=(hash model=model save=(action "save"))}} {{plugin-outlet name="user-preferences-notifications" args=(hash model=model save=(action "save"))}}
<br/> <br>
{{plugin-outlet name="user-custom-controls" args=(hash model=model)}} {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}

2
app/assets/javascripts/discourse/templates/preferences/profile.hbs
View File

@ -91,7 +91,7 @@
{{plugin-outlet name="user-custom-preferences" args=(hash model=model)}} {{plugin-outlet name="user-custom-preferences" args=(hash model=model)}}
<br/> <br>
{{plugin-outlet name="user-custom-controls" args=(hash model=model)}} {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}

2
app/assets/javascripts/discourse/templates/preferences/tags.hbs
View File

@ -55,7 +55,7 @@
{{plugin-outlet name="user-preferences-tags" args=(hash model=model save=(action "save"))}} {{plugin-outlet name="user-preferences-tags" args=(hash model=model save=(action "save"))}}
<br/> <br>
{{plugin-outlet name="user-custom-controls" args=(hash model=model)}} {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}

2
app/assets/javascripts/discourse/templates/tag-groups.hbs
View File

@ -23,5 +23,5 @@
{{outlet}} {{outlet}}
<div class="clearfix" /> <div class="clearfix"></div>
</div> </div>

2
app/assets/javascripts/discourse/templates/tags/index.hbs
View File

@ -17,7 +17,7 @@
<span class="tag-sort-name {{if sortedByName 'active'}}"><a {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span> <span class="tag-sort-name {{if sortedByName 'active'}}"><a {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
</div> </div>
<hr/> <hr>
{{#each model.extras.categories as |category|}} {{#each model.extras.categories as |category|}}
{{tag-list tags=category.tags sortProperties=sortProperties categoryId=category.id}} {{tag-list tags=category.tags sortProperties=sortProperties categoryId=category.id}}

2
app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs
View File

@ -10,7 +10,7 @@
<span class="tag-sort-name {{if sortedByName 'active'}}"><a {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span> <span class="tag-sort-name {{if sortedByName 'active'}}"><a {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
</div> </div>
<hr/> <hr>
{{#if model}} {{#if model}}
{{tag-list tags=model sortProperties=sortProperties titleKey="tagging.all_tags" isPrivateMessage=true tagsForUser=tagsForUser}} {{tag-list tags=model sortProperties=sortProperties titleKey="tagging.all_tags" isPrivateMessage=true tagsForUser=tagsForUser}}

2
app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
View File

@ -10,5 +10,5 @@
{{d-icon "far-image"}} {{d-icon "far-image"}}
{{/if}} {{/if}}
<input class="wizard-hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" /> <input class="wizard-hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
</label> </label>

4
lefthook.yml
View File

@ -6,8 +6,10 @@ pre-commit:
run: bundle exec rubocop {staged_files} run: bundle exec rubocop {staged_files}
eslint: eslint:
glob: "*.{js,es6}" glob: "*.{js,es6}"
exclude: 'vendor/*' exclude: "vendor/*"
run: yarn eslint --ext .es6 -f compact {staged_files} run: yarn eslint --ext .es6 -f compact {staged_files}
ember-template-lint:
run: yarn run ember-template-lint app
yaml-syntax: yaml-syntax:
glob: "*.{yaml,yml}" glob: "*.{yaml,yml}"
# database.yml is an erb file not a yaml file # database.yml is an erb file not a yaml file