mirror of
https://github.com/discourse/discourse.git
synced 2025-01-11 21:54:03 +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
81 lines
3.0 KiB
Handlebars
81 lines
3.0 KiB
Handlebars
<div class="wizard-container__step-contents">
|
|
{{#if this.step.title}}
|
|
<h1 class="wizard-container__step-title">{{this.step.title}}</h1>
|
|
{{/if}}
|
|
|
|
<div class="wizard-container__step-container">
|
|
{{#if this.step.fields}}
|
|
<WizardStepForm @step={{this.step}}>
|
|
{{#if this.includeSidebar}}
|
|
<div class="wizard-container__sidebar">
|
|
{{#each this.step.fields as |field|}}
|
|
{{#if field.show_in_sidebar}}
|
|
<WizardField @field={{field}} @step={{this.step}} @wizard={{this.wizard}} />
|
|
{{/if}}
|
|
{{/each}}
|
|
</div>
|
|
{{/if}}
|
|
<div class="wizard-container__fields">
|
|
{{#each this.step.fields as |field|}}
|
|
{{#unless field.show_in_sidebar}}
|
|
<WizardField @field={{field}} @step={{this.step}} @wizard={{this.wizard}} />
|
|
{{/unless}}
|
|
{{/each}}
|
|
</div>
|
|
</WizardStepForm>
|
|
{{/if}}
|
|
{{#if (or this.bannerImage this.step.description)}}
|
|
<div class={{this.bannerAndDescriptionClass}}>
|
|
{{#if this.step.description}}
|
|
<p class="wizard-container__step-description">{{html-safe this.step.description}}</p>
|
|
{{/if}}
|
|
{{#if this.bannerImage}}
|
|
<div class="wizard-container__step-banner-image">
|
|
{{#if (eq this.bannerImage "welcome-illustration")}}
|
|
<IllustrationWelcome />
|
|
{{else if (eq this.bannerImage "members-illustration")}}
|
|
<IllustrationMembers />
|
|
{{else if (eq this.bannerImage "finished-illustration")}}
|
|
<IllustrationFinished />
|
|
{{/if}}
|
|
</div>
|
|
{{/if}}
|
|
</div>
|
|
{{/if}}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="wizard-container__step-footer">
|
|
<div class="wizard-container__buttons">
|
|
|
|
{{#if this.showNextButton}}
|
|
<button {{on "click" this.nextStep}} disabled={{this.saving}} type="button" class="wizard-container__button primary {{this.nextButtonClass}}">
|
|
{{i18n this.nextButtonLabel}}
|
|
</button>
|
|
{{/if}}
|
|
|
|
{{#if this.showFinishButton}}
|
|
<button {{on "click" this.exitEarly}} disabled={{this.saving}} type="button" class="wizard-container__button jump-in">
|
|
{{i18n "wizard.jump_in"}}
|
|
</button>
|
|
{{/if}}
|
|
|
|
{{#if this.showJumpInButton}}
|
|
<button {{on "click" this.quit}} disabled={{this.saving}} type="button" class="wizard-container__button {{this.jumpInButtonClass}}">
|
|
{{i18n this.jumpInButtonLabel}}
|
|
</button>
|
|
{{/if}}
|
|
</div>
|
|
|
|
<div class="wizard-container__step-progress">
|
|
<a href {{on "click" this.backStep}} class="wizard-container__link back {{unless this.showBackButton "inactive"}}">{{d-icon "chevron-left"}}</a>
|
|
|
|
<span class="wizard-container__step-text">{{bound-i18n "wizard.step-text"}}</span>
|
|
<span class="wizard-container__step-count">{{bound-i18n "wizard.step" current=this.step.displayIndex total=this.wizard.totalSteps}}</span>
|
|
|
|
<a href {{on "click" this.nextStep}} class="wizard-container__link {{unless this.showNextButton "inactive"}}">{{d-icon "chevron-right"}}</a>
|
|
|
|
</div>
|
|
|
|
</div>
|