mirror of
https://github.com/discourse/discourse.git
synced 2024-12-15 15:53:41 +08:00
03b7b7d1bc
This PR enables the [`no-action-modifiers`](https://github.com/ember-template-lint/ember-template-lint/blob/master/docs/rule/no-action-modifiers.md) template lint rule and removes all usages of the `{{action}}` modifier in core. In general, instances of `{{action "x"}}` have been replaced with `{{on "click" (action "x")}}`. In many cases, such as for `a` elements, we also need to prevent default event handling to avoid unwanted side effects. While the `{{action}}` modifier internally calls `event.preventDefault()`, we need to handle these cases more explicitly. For this purpose, this PR also adds the [ember-event-helpers](https://github.com/buschtoens/ember-event-helpers) dependency so we can use the `prevent-default` handler. For instance: ``` <a href {{on "click" (prevent-default (action "x"))}}>Do X</a> ``` Note that `action` has not in general been refactored away as a helper yet. In general, all event handlers should be methods on the corresponding component and referenced directly (e.g. `{{on "click" this.doSomething}}`). However, the `action` helper is used extensively throughout the codebase and often references methods in the `actions` hash on controllers or routes. Thus this refactor will also be extensive and probably deserves a separate PR. Note: This work was done to complement #17767 by minimizing the potential impact of the `action` modifier override, which uses private API and arguably should be replaced with an AST transform. This is a followup to #18333, which had to be reverted because it did not account for the default treatment of modifier keys by the {{action}} modifier. Commits: * Enable `no-action-modifiers` template lint rule * Replace {{action "x"}} with {{on "click" (action "x")}} * Remove unnecessary action helper usage * Remove ctl+click tests for user-menu These tests now break in Chrome when used with addEventListener. As per the comment, they can probably be safely removed. * Prevent default event handlers to avoid unwanted side effects Uses `event.preventDefault()` in event handlers to prevent default event handling. This had been done automatically by the `action` modifier, but is not always desirable or necessary. * Restore UserCardContents#showUser action to avoid regression By keeping the `showUser` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showUser` argument that's been passed. * Revert EditCategoryTab#selectTab -> EditCategoryTab#select Avoid potential breaking change in themes / plugins * Restore GroupCardContents#showGroup action to avoid regression By keeping the `showGroup` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showGroup` argument that's been passed. * Restore SecondFactorAddTotp#showSecondFactorKey action to avoid regression By keeping the `showSecondFactorKey` action, we can avoid a breaking change for plugins that rely upon it, while not interfering with the `showSecondFactorKey` property that's maintained on the controller. * Refactor away from `actions` hash in ChooseMessage component * Modernize EmojiPicker#onCategorySelection usage * Modernize SearchResultEntry#logClick usage * Modernize Discovery::Categories#showInserted usage * Modernize Preferences::Account#resendConfirmationEmail usage * Modernize MultiSelect::SelectedCategory#onSelectedNameClick usage * Favor fn over action in SelectedChoice component * Modernize WizardStep event handlers * Favor fn over action usage in buttons * Restore Login#forgotPassword action to avoid possible regression * Introduce modKeysPressed utility Returns an array of modifier keys that are pressed during a given `MouseEvent` or `KeyboardEvent`. * Don't interfere with click events on links with `href` values when modifier keys are pressed
175 lines
7.0 KiB
Handlebars
175 lines
7.0 KiB
Handlebars
<DSection @class="current-badge content-body">
|
|
<form class="form-horizontal">
|
|
<div class="control-group">
|
|
<label for="name">{{i18n "admin.badges.name"}}</label>
|
|
{{#if this.readOnly}}
|
|
<Input @type="text" name="name" @value={{this.buffered.name}} disabled={{true}} />
|
|
<p class="help">
|
|
<LinkTo @route="adminSiteText" @query={{hash q=(concat this.textCustomizationPrefix "name")}}>
|
|
{{i18n "admin.badges.read_only_setting_help"}}
|
|
</LinkTo>
|
|
</p>
|
|
{{else}}
|
|
<Input @type="text" name="name" @value={{this.buffered.name}} />
|
|
{{/if}}
|
|
</div>
|
|
|
|
<div class="control-group">
|
|
<label for="graphic">{{i18n "admin.badges.graphic"}}</label>
|
|
<div class="radios inline-form full-width">
|
|
<label class="radio-label" for="badge-icon">
|
|
<RadioButton @name="badge-icon" @id="badge-icon" @value="icon" @selection={{this.selectedGraphicType}} @onChange={{action "changeGraphicType"}} />
|
|
<span>{{i18n "admin.badges.select_an_icon"}}</span>
|
|
</label>
|
|
|
|
<label class="radio-label" for="badge-image">
|
|
<RadioButton @name="badge-image" @id="badge-image" @value="image" @selection={{this.selectedGraphicType}} @onChange={{action "changeGraphicType"}} />
|
|
<span>{{i18n "admin.badges.upload_an_image"}}</span>
|
|
</label>
|
|
</div>
|
|
{{#if this.imageUploaderSelected}}
|
|
<UppyImageUploader @id="badge-image-uploader" @imageUrl={{this.buffered.image_url}} @type="badge_image" @onUploadDone={{action "setImage"}} @onUploadDeleted={{action "removeImage"}} @class="no-repeat contain-image" />
|
|
<div class="control-instructions">
|
|
<p class="help">{{i18n "admin.badges.image_help"}}</p>
|
|
</div>
|
|
{{else if this.iconSelectorSelected}}
|
|
<IconPicker @name="icon" @value={{this.buffered.icon}} @options={{hash maximum=1}} @onChange={{action (mut this.buffered.icon)}} />
|
|
{{/if}}
|
|
</div>
|
|
|
|
<div class="control-group">
|
|
<label for="badge_type_id">{{i18n "admin.badges.badge_type"}}</label>
|
|
<ComboBox @name="badge_type_id" @value={{this.buffered.badge_type_id}} @content={{this.badgeTypes}} @onChange={{action (mut this.buffered.badge_type_id)}} @options={{hash
|
|
disabled=this.readOnly
|
|
}} />
|
|
</div>
|
|
|
|
<div class="control-group">
|
|
<label for="badge_grouping_id">{{i18n "admin.badges.badge_grouping"}}</label>
|
|
|
|
<div class="badge-grouping-control">
|
|
<ComboBox @name="badge_grouping_id" @value={{this.buffered.badge_grouping_id}} @content={{this.badgeGroupings}} @class="badge-selector" @nameProperty="name" @onChange={{action (mut this.buffered.badge_grouping_id)}} />
|
|
<DButton @class="btn-default" @action={{route-action "editGroupings"}} @icon="pencil-alt" />
|
|
</div>
|
|
</div>
|
|
|
|
<div class="control-group">
|
|
<label for="description">{{i18n "admin.badges.description"}}</label>
|
|
{{#if this.buffered.system}}
|
|
<Textarea name="description" @value={{this.buffered.description}} disabled={{true}} />
|
|
<p class="help">
|
|
<LinkTo @route="adminSiteText" @query={{hash q=(concat this.textCustomizationPrefix "description")}}>
|
|
{{i18n "admin.badges.read_only_setting_help"}}
|
|
</LinkTo>
|
|
</p>
|
|
{{else}}
|
|
<Textarea name="description" @value={{this.buffered.description}} />
|
|
{{/if}}
|
|
</div>
|
|
|
|
<div class="control-group">
|
|
<label for="long_description">{{i18n "admin.badges.long_description"}}</label>
|
|
{{#if this.buffered.system}}
|
|
<Textarea name="long_description" @value={{this.buffered.long_description}} disabled={{true}} />
|
|
<p class="help">
|
|
<LinkTo @route="adminSiteText" @query={{hash q=(concat this.textCustomizationPrefix "long_description")}}>
|
|
{{i18n "admin.badges.read_only_setting_help"}}
|
|
</LinkTo>
|
|
</p>
|
|
{{else}}
|
|
<Textarea name="long_description" @value={{this.buffered.long_description}} />
|
|
{{/if}}
|
|
</div>
|
|
|
|
{{#if this.siteSettings.enable_badge_sql}}
|
|
<div class="control-group">
|
|
<label for="query">{{i18n "admin.badges.query"}}</label>
|
|
<AceEditor @content={{this.buffered.query}} @mode="sql" @disabled={{this.readOnly}} />
|
|
</div>
|
|
|
|
{{#if this.hasQuery}}
|
|
<a href {{on "click" (fn this.showPreview this.buffered "false")}}>{{i18n "admin.badges.preview.link_text"}}</a>
|
|
|
|
|
<a href {{on "click" (fn this.showPreview this.buffered "true")}}>{{i18n "admin.badges.preview.plan_text"}}</a>
|
|
{{#if this.preview_loading}}
|
|
{{i18n "loading"}}
|
|
{{/if}}
|
|
|
|
<div class="control-group">
|
|
<label>
|
|
<Input name="auto_revoke" @type="checkbox" @checked={{this.buffered.auto_revoke}} disabled={{this.readOnly}} />
|
|
{{i18n "admin.badges.auto_revoke"}}
|
|
</label>
|
|
</div>
|
|
|
|
<div class="control-group">
|
|
<label>
|
|
<Input name="target_posts" @type="checkbox" @checked={{this.buffered.target_posts}} disabled={{this.readOnly}} />
|
|
{{i18n "admin.badges.target_posts"}}
|
|
</label>
|
|
</div>
|
|
|
|
<div class="control-group">
|
|
<label for="trigger">{{i18n "admin.badges.trigger"}}</label>
|
|
<ComboBox name="trigger" @value={{this.buffered.trigger}} @content={{this.badgeTriggers}} @onChange={{action (mut this.buffered.trigger)}} @options={{hash
|
|
disabled=this.readOnly
|
|
}} />
|
|
</div>
|
|
{{/if}}
|
|
{{/if}}
|
|
|
|
<div class="control-group">
|
|
<div>
|
|
<label>
|
|
<Input @type="checkbox" @checked={{this.buffered.allow_title}} />
|
|
{{i18n "admin.badges.allow_title"}}
|
|
</label>
|
|
</div>
|
|
|
|
<div>
|
|
<label>
|
|
<Input @type="checkbox" @checked={{this.buffered.multiple_grant}} disabled={{this.readOnly}} />
|
|
{{i18n "admin.badges.multiple_grant"}}
|
|
</label>
|
|
</div>
|
|
|
|
<div>
|
|
<label>
|
|
<Input @type="checkbox" @checked={{this.buffered.listable}} disabled={{this.readOnly}} />
|
|
{{i18n "admin.badges.listable"}}
|
|
</label>
|
|
</div>
|
|
|
|
<div>
|
|
<label>
|
|
<Input @type="checkbox" @checked={{this.buffered.show_posts}} disabled={{this.readOnly}} />
|
|
{{i18n "admin.badges.show_posts"}}
|
|
</label>
|
|
</div>
|
|
|
|
<div>
|
|
<label>
|
|
<Input @type="checkbox" @checked={{this.buffered.enabled}} />
|
|
{{i18n "admin.badges.enabled"}}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="buttons">
|
|
<DButton @class="btn-primary" @action={{action "save"}} @type="submit" @disabled={{this.saving}} @label="admin.badges.save" />
|
|
<span class="saving">{{this.savingStatus}}</span>
|
|
{{#unless this.readOnly}}
|
|
<DButton @action={{action "destroyBadge"}} @class="btn-danger" @label="admin.badges.delete" />
|
|
{{/unless}}
|
|
</div>
|
|
</form>
|
|
</DSection>
|
|
|
|
{{#if this.grant_count}}
|
|
<div class="content-body current-badge-actions">
|
|
<div>
|
|
<LinkTo @route="badges.show" @model={{this}}>{{i18n "badges.granted" count=this.grant_count}}</LinkTo>
|
|
</div>
|
|
</div>
|
|
{{/if}}
|