DEV: Remove use of PluginOutlet `@tagName` argument in core

The `tagName` argument is now deprecated. This commit uses a codemod (https://github.com/discourse/discourse-ember-codemods/tree/main/transforms/extract-plugin-outlet-tagname) to automatically remove the `@tagName` from all PluginOutlet invocations, and create a matching wrapper element so that the HTML structure is unchanged. We may want to remove some/all of these wrappers entirely in future, but that would be a riskier change which we should tackle on a case-by-case basis.
This commit is contained in:
David Taylor 2023-01-31 11:33:26 +00:00
parent f9d5203610
commit 26b5c0472f
59 changed files with 664 additions and 593 deletions

View File

@ -1,10 +1,11 @@
<div class="inner-wrapper">
<span>
<PluginOutlet
@name="admin-customize-themes-list-item"
@tagName="span"
@connectorTagName="span"
@args={{hash theme=this.theme}}
/>
</span>
<div class="info">
<span class="name">

View File

@ -1,10 +1,11 @@
<div class="show-current-style">
<span>
<PluginOutlet
@name="admin-customize-themes-show-top"
@tagName="span"
@connectorTagName="div"
@args={{hash theme=this.model}}
/>
</span>
<div class="title">
{{#if this.editingName}}
<TextField @value={{this.model.name}} @autofocus="true" />

View File

@ -1,8 +1,6 @@
<PluginOutlet
@name="admin-dashboard-top"
@tagName="span"
@connectorTagName="div"
/>
<span>
<PluginOutlet @name="admin-dashboard-top" @connectorTagName="div" />
</span>
{{#if this.showVersionChecks}}
<div class="section-top">
@ -57,8 +55,6 @@
<DashboardNewFeatures @tagName="div" />
<PluginOutlet
@name="admin-dashboard-bottom"
@tagName="span"
@connectorTagName="div"
/>
<span>
<PluginOutlet @name="admin-dashboard-bottom" @connectorTagName="div" />
</span>

View File

@ -1,9 +1,7 @@
<ConditionalLoadingSpinner @condition={{this.isLoading}}>
<PluginOutlet
@name="admin-dashboard-general-top"
@tagName="span"
@connectorTagName="div"
/>
<span>
<PluginOutlet @name="admin-dashboard-general-top" @connectorTagName="div" />
</span>
{{#if this.isCommunityHealthVisible}}
<div class="community-health section">
@ -197,9 +195,10 @@
{{/if}}
</div>
<span>
<PluginOutlet
@name="admin-dashboard-general-bottom"
@tagName="span"
@connectorTagName="div"
/>
</span>
</ConditionalLoadingSpinner>

View File

@ -1,9 +1,10 @@
<div class="sections">
<span>
<PluginOutlet
@name="admin-dashboard-moderation-top"
@tagName="span"
@connectorTagName="div"
/>
</span>
{{#if this.isModeratorsActivityVisible}}
<div class="moderators-activity section">
@ -49,11 +50,12 @@
@reportOptions={{this.userFlaggingRatioOptions}}
/>
<span>
<PluginOutlet
@name="admin-dashboard-moderation-bottom"
@tagName="span"
@connectorTagName="div"
@args={{hash filters=this.lastWeekfilters}}
/>
</span>
</div>
</div>

View File

@ -1,9 +1,10 @@
<div class="sections">
<span>
<PluginOutlet
@name="admin-dashboard-security-top"
@tagName="span"
@connectorTagName="div"
/>
</span>
<div class="main-section">
<AdminReport
@ -16,10 +17,11 @@
@filters={{this.lastWeekfilters}}
/>
<span>
<PluginOutlet
@name="admin-dashboard-security-bottom"
@tagName="span"
@connectorTagName="div"
/>
</span>
</div>
</div>

View File

@ -81,9 +81,10 @@
href="https://meta.discourse.org/t/install-a-plugin/19157"
>{{i18n "admin.plugins.howto"}}</a></p>
<PluginOutlet
<span>
<PluginOutlet
@name="admin-below-plugins-index"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>

View File

@ -259,12 +259,13 @@
</section>
{{/if}}
<PluginOutlet
<span>
<PluginOutlet
@name="admin-user-details"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>
<section class="details">
<h1>{{i18n "admin.user.permissions"}}</h1>
@ -857,12 +858,13 @@
</section>
{{/if}}
<PluginOutlet
<span>
<PluginOutlet
@name="after-user-details"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>
<section>
<hr />

View File

@ -115,12 +115,13 @@
</div>
</div>
<span>
<PluginOutlet
@name="web-hook-fields"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
<label>
<Input

View File

@ -91,18 +91,20 @@
{{/if}}
</div>
<PluginOutlet
<span>
<PluginOutlet
@name="user-preferences-categories"
@tagName="span"
@connectorTagName="div"
@args={{hash model=@model save=@save}}
/>
/>
</span>
<br />
<PluginOutlet
<span>
<PluginOutlet
@name="user-custom-controls"
@tagName="span"
@connectorTagName="div"
@args={{hash model=@model}}
/>
/>
</span>

View File

@ -46,12 +46,13 @@
</section>
{{/if}}
<span>
<PluginOutlet
@name="about-after-admins"
@tagName="span"
@connectorTagName="section"
@args={{hash model=this.model}}
/>
</span>
{{#if this.model.moderators}}
<section class="about moderators">
@ -64,12 +65,13 @@
</section>
{{/if}}
<span>
<PluginOutlet
@name="about-after-moderators"
@tagName="span"
@connectorTagName="section"
@args={{hash model=this.model}}
/>
</span>
{{#if this.model.category_moderators.length}}
{{#each this.model.category_moderators as |cm|}}

View File

@ -2,11 +2,9 @@
<div class="container badges">
<h1>{{i18n "badges.title"}}</h1>
<PluginOutlet
@name="below-badges-title"
@tagName="span"
@connectorTagName="div"
/>
<span>
<PluginOutlet @name="below-badges-title" @connectorTagName="div" />
</span>
<div class="badge-groups">
{{#each this.badgeGroups as |bg|}}

View File

@ -1,9 +1,7 @@
<div class="composer-controls">
<PluginOutlet
@name="before-composer-toggles"
@tagName="span"
@connectorTagName="div"
/>
<span>
<PluginOutlet @name="before-composer-toggles" @connectorTagName="div" />
</span>
{{#if this.site.mobileView}}
<DButton

View File

@ -51,7 +51,6 @@
<PluginOutlet
@name="before-create-topic-button"
@connectorTagName="div"
@tagName=""
@args={{hash
canCreateTopic=this.canCreateTopic
createTopicDisabled=this.createTopicDisabled
@ -74,7 +73,6 @@
<PluginOutlet
@name="after-create-topic-button"
@connectorTagName="div"
@tagName=""
@args={{hash
canCreateTopic=this.canCreateTopic
createTopicDisabled=this.createTopicDisabled

View File

@ -55,8 +55,9 @@
{{/unless}}
</section>
<PluginOutlet
<section>
<PluginOutlet
@name="category-custom-security"
@args={{hash category=this.category}}
@tagName="section"
/>
/>
</section>

View File

@ -342,12 +342,13 @@
</label>
</section>
<span>
<PluginOutlet
@name="category-email-in"
@tagName="span"
@connectorTagName="div"
@args={{hash category=this.category}}
/>
</span>
{{/if}}
{{#unless this.emailInEnabled}}
@ -360,8 +361,9 @@
{{/unless}}
</section>
<PluginOutlet
<section>
<PluginOutlet
@name="category-custom-settings"
@args={{hash category=this.category}}
@tagName="section"
/>
/>
</section>

View File

@ -105,12 +105,13 @@
@placeholderKey="admin.groups.manage.interaction.incoming_email_placeholder"
/>
<span>
<PluginOutlet
@name="group-email-in"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
</div>
{{/if}}
@ -129,9 +130,10 @@
/>
</div>
<PluginOutlet
<span>
<PluginOutlet
@name="groups-interaction-custom-options"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>

View File

@ -94,12 +94,13 @@
{{/if}}
</div>
<span>
<PluginOutlet
@name="groups-form-membership-below-automatic"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
<div class="control-group">
<label class="control-label">{{i18n

View File

@ -44,10 +44,11 @@
{{#if this.canEdit}}
{{yield}}
<span>
<PluginOutlet
@name="group-edit"
@tagName="span"
@connectorTagName="div"
@args={{hash group=this.model}}
/>
</span>
{{/if}}

View File

@ -21,12 +21,13 @@
{{html-safe this.reviewable.cooked}}
{{/if}}
</div>
<span>
<PluginOutlet
@name="after-reviewable-flagged-post-body"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.reviewable}}
/>
</span>
{{yield}}
</div>
</div>

View File

@ -41,12 +41,13 @@
{{#if this.post.topic}}
{{discourse-tags this.post.topic}}
{{/if}}
<span>
<PluginOutlet
@name="full-page-search-category"
@tagName="span"
@connectorTagName="div"
@args={{hash post=this.post}}
/>
</span>
</div>
</div>

View File

@ -27,9 +27,10 @@
</h3>
</div>
<PluginOutlet
<span>
<PluginOutlet
@name="below-suggested-topics"
@tagName="span"
@connectorTagName="div"
@args={{hash topic=this.topic}}
/>
/>
</span>

View File

@ -131,11 +131,12 @@
</section>
{{/if}}
{{#if this.canAdminTag}}
<section>
<PluginOutlet
@name="tag-custom-settings"
@args={{hash tag=this.tagInfo}}
@tagName="section"
/>
</section>
<div class="tag-actions">
<DButton
@class="btn-default"

View File

@ -12,9 +12,10 @@
{{/if}}
</div>
<PluginOutlet
<span>
<PluginOutlet
@name="topic-category"
@tagName="span"
@connectorTagName="div"
@args={{hash topic=this.topic category=this.topic.category}}
/>
/>
</span>

View File

@ -29,8 +29,4 @@
<div class="bg"></div>
</nav>
<PluginOutlet
@name="after-topic-progress"
@tagName=""
@connectorTagName="div"
/>
<PluginOutlet @name="after-topic-progress" @connectorTagName="div" />

View File

@ -2,10 +2,11 @@
<div class="title-wrapper">
{{yield}}
</div>
<span>
<PluginOutlet
@name="topic-title"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
</div>

View File

@ -43,13 +43,14 @@
<UserAvatarFlair @user={{this.user}} />
<div>
<PluginOutlet
@name="user-card-avatar-flair"
@connectorTagName="div"
@args={{hash user=this.user}}
@tagName="div"
/>
</div>
</div>
<div class="names">
<h1
class="{{this.staff}}
@ -117,13 +118,14 @@
{{format-date this.user.status.ends_at format="tiny"}}
</h3>
{{/if}}
<div>
<PluginOutlet
@name="user-card-post-names"
@connectorTagName="div"
@args={{hash user=this.user}}
@tagName="div"
/>
</div>
</div>
<ul class="usercard-controls">
{{#if this.user.can_send_private_message_to_user}}
<li class="compose-pm">
@ -139,7 +141,6 @@
@name="user-card-below-message-button"
@connectorTagName="li"
@args={{hash user=this.user close=(action "close")}}
@tagName=""
/>
{{#if this.showFilter}}
<li>
@ -171,12 +172,13 @@
/>
</li>
{{/if}}
<li>
<PluginOutlet
@name="user-card-additional-buttons"
@connectorTagName="div"
@args={{hash user=this.user close=(action "close")}}
@tagName="li"
/>
</li>
</ul>
<PluginOutlet
@name="user-card-additional-controls"
@ -278,12 +280,13 @@
<span>{{this.formattedUserLocalTime}}</span>
</span>
{{/if}}
<span>
<PluginOutlet
@name="user-card-location-and-website"
@tagName="span"
@connectorTagName="div"
@args={{hash user=this.user}}
/>
</span>
</div>
</div>
{{/if}}

View File

@ -37,12 +37,13 @@
@showTooltip={{@showStatusTooltip}}
/>
{{/if}}
<span>
<PluginOutlet
@name="after-user-name"
@tagName="span"
@connectorTagName="span"
@args={{hash user=this.user}}
/>
</span>
</div>
<div class="title">{{@user.title}}</div>
@ -54,9 +55,10 @@
</div>
<PluginOutlet
<span>
<PluginOutlet
@name="after-user-info"
@tagName="span"
@connectorTagName="div"
@args={{hash user=this.user}}
/>
/>
</span>

View File

@ -1,10 +1,11 @@
<div class="user-profile-avatar">
{{bound-avatar @user "huge"}}
<UserAvatarFlair @user={{@user}} />
<div>
<PluginOutlet
@name="user-profile-avatar-flair"
@connectorTagName="div"
@args={{hash model=@user}}
@tagName="div"
/>
</div>
</div>

View File

@ -43,12 +43,13 @@
</span>
{{/if}}
<span>
<PluginOutlet
@name="user-stream-item-header"
@tagName="span"
@connectorTagName="div"
@args={{hash item=@item}}
/>
</span>
</div>
{{#if this.actionDescription}}

View File

@ -27,12 +27,13 @@
aria-label={{I18n this.saveLabel}}
class="reply-area {{if this.canEditTags 'with-tags' 'without-tags'}}"
>
<span>
<PluginOutlet
@name="composer-open"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
<div class="reply-to">
{{#unless this.model.viewFullscreen}}
@ -201,29 +202,32 @@
</div>
{{/if}}
<span>
<PluginOutlet
@name="composer-fields"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model showPreview=this.showPreview}}
/>
</span>
{{/unless}}
</div>
</ComposerEditor>
<span>
<PluginOutlet
@name="composer-after-composer-editor"
@tagName="span"
@args={{hash model=this.model}}
/>
</span>
<div class="submit-panel">
<span>
<PluginOutlet
@name="composer-fields-below"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
<div class="save-or-cancel">
<ComposerSaveButton
@ -304,19 +308,21 @@
{{/if}}
</div>
<span>
<PluginOutlet
@name="composer-after-save-or-cancel"
@tagName="span"
@args={{hash model=this.model}}
/>
</span>
</div>
{{#if this.site.mobileView}}
<span>
<PluginOutlet
@name="composer-mobile-buttons-bottom"
@tagName="span"
@args={{hash model=this.model}}
/>
</span>
{{#if this.allowUpload}}
<a

View File

@ -8,11 +8,9 @@
{{/unless}}
</div>
<PluginOutlet
@name="discovery-list-controls-above"
@tagName="span"
@connectorTagName="div"
/>
<span>
<PluginOutlet @name="discovery-list-controls-above" @connectorTagName="div" />
</span>
<div class="list-controls">
<PluginOutlet
@ -26,7 +24,9 @@
<ConditionalLoadingSpinner @condition={{this.loading}} />
<PluginOutlet @name="discovery-above" @tagName="span" @connectorTagName="div" />
<span>
<PluginOutlet @name="discovery-above" @connectorTagName="div" />
</span>
{{#if this.showEditWelcomeTopicBanner}}
<WelcomeTopicBanner />
@ -50,7 +50,6 @@
<div id="list-area">
<PluginOutlet
@name="discovery-list-container-top"
@tagName=""
@connectorTagName="span"
@args={{hash category=this.category listLoading=this.loading}}
/>
@ -60,4 +59,6 @@
</div>
</div>
<PluginOutlet @name="discovery-below" @tagName="span" @connectorTagName="div" />
<span>
<PluginOutlet @name="discovery-below" @connectorTagName="div" />
</span>

View File

@ -59,12 +59,13 @@
</div>
{{/if}}
{{/if}}
<span>
<PluginOutlet
@name="before-topic-list"
@tagName="span"
@connectorTagName="div"
@args={{hash category=this.category}}
/>
</span>
{{#if this.hasTopics}}
<TopicList
@ -95,12 +96,13 @@
/>
{{/if}}
<span>
<PluginOutlet
@name="after-topic-list"
@tagName="span"
@connectorTagName="div"
@args={{hash category=this.category}}
/>
</span>
</DiscoveryTopicsList>
<footer class="topic-list-bottom">

View File

@ -137,12 +137,13 @@
{{/if}}
{{/if}}
<span>
<PluginOutlet
@name="full-page-search-below-search-info"
@tagName="span"
@connectorTagName="div"
@args={{hash search=this.searchTerm}}
/>
</span>
{{#if this.searching}}
{{loading-spinner size="medium"}}

View File

@ -1,9 +1,10 @@
<PluginOutlet
<span>
<PluginOutlet
@name="before-group-container"
@tagName="span"
@connectorTagName="div"
@args={{hash group=this.model}}
/>
/>
</span>
<div class="container group group-{{this.model.name}}">
{{#if this.showTooltip}}
@ -73,12 +74,13 @@
{{/if}}
</div>
<span>
<PluginOutlet
@name="group-details-after"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
</div>
{{#if this.model.bio_cooked}}

View File

@ -102,12 +102,13 @@
{{/if}}
</GroupMembershipButton>
<span>
<PluginOutlet
@name="group-index-box-after"
@tagName="span"
@connectorTagName="div"
@args={{hash model=group}}
/>
</span>
</div>
</div>
</LinkTo>

View File

@ -1,12 +1,13 @@
<LoadMore @selector=".directory .user" @action={{action "loadMore"}}>
<div class="container">
<div class="users-directory directory">
<span>
<PluginOutlet
@name="users-top"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
<div class="directory-controls">
<PeriodChooser

View File

@ -4,11 +4,12 @@
@action={{action "createAccount"}}
>
{{#unless this.complete}}
<span>
<PluginOutlet
@name="create-account-before-modal-body"
@tagName="span"
@connectorTagName="div"
/>
</span>
<DModalBody
@class={{this.modalBodyClasses}}
@preventModalAlertHiding={{true}}

View File

@ -158,12 +158,13 @@
</div>
{{/if}}
<span>
<PluginOutlet
@name="post-revisions"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
<LinksRedirect @class="row">
{{html-safe this.bodyDiff}}

View File

@ -8,12 +8,13 @@
{{/if}}
{{/if}}
<span>
<PluginOutlet
@name="category-heading"
@tagName="span"
@connectorTagName="div"
@args={{hash category=this.category}}
/>
</span>
</section>
<DSection @class="navigation-container category-navigation">

View File

@ -79,12 +79,13 @@
</li>
{{/if}}
<span>
<PluginOutlet
@name="user-preferences-nav-under-interface"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
{{#if this.model.userApiKeys}}
<li class="nav-apps">
@ -94,23 +95,25 @@
</li>
{{/if}}
<span>
<PluginOutlet
@name="user-preferences-nav"
@tagName="span"
@connectorTagName="li"
@args={{hash model=this.model}}
/>
</span>
</MobileNav>
</DSection>
{{/if}}
<section class="user-content user-preferences" id="user-content">
<span>
<PluginOutlet
@name="above-user-preferences"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
<form class="form-vertical">
{{outlet}}

View File

@ -263,21 +263,23 @@
</div>
{{/if}}
<PluginOutlet
<span>
<PluginOutlet
@name="user-preferences-account"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model save=(action "save")}}
/>
/>
</span>
<br />
<PluginOutlet
<span>
<PluginOutlet
@name="user-custom-controls"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>
{{#if this.canSaveUser}}
<SaveControls

View File

@ -1,8 +1,9 @@
<UserPreferences::UserApiKeys @model={{@model}} />
<PluginOutlet
<span>
<PluginOutlet
@name="user-preferences-apps"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>

View File

@ -52,12 +52,13 @@
@checked={{this.model.user_option.email_in_reply_to}}
/>
<span>
<PluginOutlet
@name="user-preferences-emails-pref-email-settings"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model save=(action "save")}}
/>
</span>
</div>
{{#unless this.siteSettings.disable_digest_emails}}
@ -112,21 +113,23 @@
</div>
{{/unless}}
<PluginOutlet
<span>
<PluginOutlet
@name="user-preferences-emails"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model save=(action "save")}}
/>
/>
</span>
<br />
<PluginOutlet
<span>
<PluginOutlet
@name="user-custom-controls"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>
<SaveControls
@model={{this.model}}

View File

@ -1,9 +1,10 @@
<PluginOutlet
<span>
<PluginOutlet
@name="user-preferences-interface-top"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model save=(action "save")}}
/>
/>
</span>
{{#if this.showThemeSelector}}
<div class="control-group theme">
@ -233,21 +234,23 @@
{{/if}}
</fieldset>
<PluginOutlet
<span>
<PluginOutlet
@name="user-preferences-interface"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model save=(action "save")}}
/>
/>
</span>
<br />
<PluginOutlet
<span>
<PluginOutlet
@name="user-custom-controls"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>
<SaveControls
@model={{this.model}}

View File

@ -32,12 +32,13 @@
<div class="instructions">{{i18n
"user.desktop_notifications.each_browser_note"
}}</div>
<span>
<PluginOutlet
@name="user-preferences-desktop-notifications"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model save=(action "save")}}
/>
</span>
</div>
{{/unless}}
@ -49,21 +50,23 @@
{{/unless}}
{{/if}}
<PluginOutlet
<span>
<PluginOutlet
@name="user-preferences-notifications"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model save=(action "save")}}
/>
/>
</span>
<br />
<PluginOutlet
<span>
<PluginOutlet
@name="user-custom-controls"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>
<SaveControls
@model={{this.model}}

View File

@ -155,28 +155,31 @@
</div>
{{/if}}
<PluginOutlet
<span>
<PluginOutlet
@name="user-preferences-profile"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model save=(action "save")}}
/>
/>
</span>
<PluginOutlet
<span>
<PluginOutlet
@name="user-custom-preferences"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>
<br />
<PluginOutlet
<span>
<PluginOutlet
@name="user-custom-controls"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>
<SaveControls
@model={{this.model}}

View File

@ -104,18 +104,20 @@
<UserPreferences::UserApiKeys @model={{@model}} />
{{/if}}
<PluginOutlet
<span>
<PluginOutlet
@name="user-preferences-security"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model save=(action "save")}}
/>
/>
</span>
<br />
<PluginOutlet
<span>
<PluginOutlet
@name="user-custom-controls"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>

View File

@ -56,12 +56,13 @@
</div>
{{/if}}
<PluginOutlet
<span>
<PluginOutlet
@name="user-custom-controls"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
/>
</span>
<SaveControls
@model={{this.model}}

View File

@ -28,12 +28,16 @@
{{#if this.filtersExpanded}}
<span>
<PluginOutlet
@name="above-review-filters"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model additionalFilters=this.additionalFilters}}
@args={{hash
model=this.model
additionalFilters=this.additionalFilters
}}
/>
</span>
<div class="reviewable-filter">
<label class="filter-label">{{i18n "review.filters.type.title"}}</label>

View File

@ -2,11 +2,9 @@
<WatchRead @action={{action "markFaqRead"}} @path={{this.model.path}}>
<div class="contents clearfix body-page">
<PluginOutlet
@name="above-static"
@tagName="span"
@connectorTagName="div"
/>
<span>
<PluginOutlet @name="above-static" @connectorTagName="div" />
</span>
{{html-safe this.model.html}}

View File

@ -13,11 +13,12 @@
<DiscourseBanner @user={{this.currentUser}} @banner={{this.site.banner}} />
</div>
<span>
<PluginOutlet
@name="discovery-list-controls-above"
@tagName="span"
@connectorTagName="div"
/>
</span>
<div class="list-controls">
<PluginOutlet
@ -61,12 +62,13 @@
/>
{{/if}}
<span>
<PluginOutlet
@name="discovery-list-container-top"
@tagName="span"
@connectorTagName="div"
@args={{hash category=this.category}}
/>
</span>
<TopicDismissButtons
@position="top"
@ -77,11 +79,9 @@
@resetNew={{action "resetNew"}}
/>
<PluginOutlet
@name="discovery-above"
@tagName="span"
@connectorTagName="div"
/>
<span>
<PluginOutlet @name="discovery-above" @connectorTagName="div" />
</span>
<div class="container list-container">
<div class="row">
@ -178,9 +178,7 @@
</div>
</div>
<PluginOutlet
@name="discovery-below"
@tagName="span"
@connectorTagName="div"
/>
<span>
<PluginOutlet @name="discovery-below" @connectorTagName="div" />
</span>
</DSection>

View File

@ -11,12 +11,13 @@
</div>
</div>
<PluginOutlet
<div>
<PluginOutlet
@name="tags-below-title"
@connectorTagName="div"
@tagName="div"
@args={{hash model=this.model}}
/>
/>
</div>
<div class="tag-sort-options">
{{i18n "tagging.sort_by"}}

View File

@ -24,12 +24,13 @@
<SharedDraftControls @topic={{this.model}} />
{{/if}}
<span>
<PluginOutlet
@name="topic-above-post-stream"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model editFirstPost=(action "editFirstPost")}}
/>
</span>
{{#if this.model.postStream.loaded}}
{{#if this.model.postStream.firstPostPresent}}
@ -72,12 +73,13 @@
/>
{{/if}}
<span>
<PluginOutlet
@name="edit-topic"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model buffered=this.buffered}}
/>
</span>
<div class="edit-controls">
<DButton
@ -148,7 +150,6 @@
<PluginOutlet
@name="topic-title-suffix"
@tagName=""
@args={{hash model=this.model}}
/>
</h1>
@ -291,12 +292,13 @@
@expanded={{info.topicProgressExpanded}}
@jumpToPost={{action "jumpToPost"}}
>
<span>
<PluginOutlet
@name="before-topic-progress"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model jumpToPost=(action "jumpToPost")}}
/>
</span>
<TopicAdminMenuButton
@topic={{this.model}}
@openUpwards="true"
@ -329,12 +331,13 @@
@condition={{this.model.postStream.loadingAbove}}
/>
<span>
<PluginOutlet
@name="topic-above-posts"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
{{#unless this.model.postStream.loadingFilter}}
<ScrollingPostStream
@ -519,12 +522,13 @@
<SignupCta />
{{else}}
{{#if this.currentUser}}
<span>
<PluginOutlet
@name="topic-above-footer-buttons"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
<TopicFooterButtons
@topic={{this.model}}
@ -560,12 +564,13 @@
{{/if}}
{{/if}}
<span>
<PluginOutlet
@name="topic-above-suggested"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
<div
class="{{if
this.model.relatedMessages.length

View File

@ -146,12 +146,13 @@
class="user-profile-names__title"
>{{this.model.title}}</div>
{{/if}}
<span>
<PluginOutlet
@name="user-post-names"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
</div>
{{#if this.showFeaturedTopic}}
@ -196,12 +197,13 @@
{{/if}}
</div>
{{/if}}
<span>
<PluginOutlet
@name="user-location-and-website"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
</div>
<div class="bio">
@ -250,24 +252,26 @@
{{/if}}
{{/each}}
<span>
<PluginOutlet
@name="user-profile-public-fields"
@tagName="span"
@connectorTagName="div"
@args={{hash
publicUserFields=this.publicUserFields
model=this.model
}}
/>
</span>
</div>
{{/if}}
<span>
<PluginOutlet
@name="user-profile-primary"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
</div>
<section class="controls">

View File

@ -67,12 +67,13 @@
}}</DNavigationItem>
{{/if}}
<span>
<PluginOutlet
@name="user-activity-bottom"
@tagName="span"
@connectorTagName="li"
@args={{hash model=this.model}}
/>
</span>
</MobileNav>
</nav>
</DSection>

View File

@ -154,12 +154,13 @@
{{/if}}
{{/if}}
<span>
<PluginOutlet
@name="user-messages-nav"
@tagName="span"
@connectorTagName="li"
@args={{hash model=this.model}}
/>
</span>
</MobileNav>
</DSection>

View File

@ -56,12 +56,13 @@
{{i18n "user_action_groups.11"}}
</LinkTo>
</li>
<span>
<PluginOutlet
@name="user-notifications-bottom"
@tagName="span"
@connectorTagName="li"
@args={{hash model=this.model}}
/>
</span>
</MobileNav>
</DSection>

View File

@ -2,12 +2,13 @@
<LoadMore @selector=".directory tbody tr" @action={{action "loadMore"}}>
<div class="container">
<div class="users-directory directory">
<span>
<PluginOutlet
@name="users-top"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
<div class="directory-controls">
<div class="period-controls">
<PeriodChooser