DEV: Use angle bracket syntax (#476)
This commit is contained in:
parent
fb89a23530
commit
6cd56770bc
|
@ -1 +1 @@
|
|||
{{group-assigned-menu-item group=group}}
|
||||
<GroupAssignedMenuItem @group={{group}} />
|
|
@ -1 +1 @@
|
|||
{{remind-assigns-frequency user=model}}
|
||||
<RemindAssignsFrequency @user={{model}} />
|
|
@ -68,21 +68,21 @@
|
|||
}}
|
||||
<td class="topic-list-data">
|
||||
{{#if topic.assigned_to_user}}
|
||||
{{assign-actions-dropdown
|
||||
topic=topic
|
||||
assignee=topic.assigned_to_user.username
|
||||
unassign=unassign
|
||||
reassign=reassign
|
||||
}}
|
||||
<AssignActionsDropdown
|
||||
@topic={{topic}}
|
||||
@assignee={{topic.assigned_to_user.username}}
|
||||
@unassign={{unassign}}
|
||||
@reassign={{reassign}}
|
||||
/>
|
||||
{{else if topic.assigned_to_group}}
|
||||
{{assign-actions-dropdown
|
||||
topic=topic
|
||||
assignee=topic.assigned_to_group.name
|
||||
group=true
|
||||
unassign=unassign
|
||||
reassign=reassign
|
||||
}}
|
||||
<AssignActionsDropdown
|
||||
@topic={{topic}}
|
||||
@assignee={{topic.assigned_to_group.name}}
|
||||
@group={{true}}
|
||||
@unassign={{unassign}}
|
||||
@reassign={{reassign}}
|
||||
/>
|
||||
{{else}}
|
||||
{{assign-actions-dropdown topic=topic unassign=unassign}}
|
||||
<AssignActionsDropdown @topic={{topic}} @unassign={{unassign}} />
|
||||
{{/if}}
|
||||
</td>
|
|
@ -20,22 +20,22 @@
|
|||
|
||||
<tbody class="topic-list-body assigned-topic-list-body">
|
||||
{{#each filteredTopics as |topic|}}
|
||||
{{assigned-topic-list-item
|
||||
topic=topic
|
||||
bulkSelectEnabled=bulkSelectEnabled
|
||||
showTopicPostBadges=showTopicPostBadges
|
||||
hideCategory=hideCategory
|
||||
showPosters=true
|
||||
showLikes=showLikes
|
||||
showOpLikes=showOpLikes
|
||||
expandGloballyPinned=expandGloballyPinned
|
||||
expandAllPinned=expandAllPinned
|
||||
lastVisitedTopic=lastVisitedTopic
|
||||
selected=selected
|
||||
tagsForUser=tagsForUser
|
||||
unassign=unassign
|
||||
reassign=reassign
|
||||
}}
|
||||
<AssignedTopicListItem
|
||||
@topic={{topic}}
|
||||
@bulkSelectEnabled={{bulkSelectEnabled}}
|
||||
@showTopicPostBadges={{showTopicPostBadges}}
|
||||
@hideCategory={{hideCategory}}
|
||||
@showPosters={{true}}
|
||||
@showLikes={{showLikes}}
|
||||
@showOpLikes={{showOpLikes}}
|
||||
@expandGloballyPinned={{expandGloballyPinned}}
|
||||
@expandAllPinned={{expandAllPinned}}
|
||||
@lastVisitedTopic={{lastVisitedTopic}}
|
||||
@selected={{selected}}
|
||||
@tagsForUser={{tagsForUser}}
|
||||
@unassign={{unassign}}
|
||||
@reassign={{reassign}}
|
||||
/>
|
||||
|
||||
{{raw "list/visited-line" lastVisitedTopic=lastVisitedTopic topic=topic}}
|
||||
{{/each}}
|
||||
|
|
|
@ -12,24 +12,24 @@
|
|||
{{/if}}
|
||||
|
||||
{{#if topics}}
|
||||
{{assigned-topic-list
|
||||
showPosters=showPosters
|
||||
hideCategory=hideCategory
|
||||
topics=topics
|
||||
expandExcerpts=expandExcerpts
|
||||
bulkSelectEnabled=bulkSelectEnabled
|
||||
canBulkSelect=canBulkSelect
|
||||
bulkSelectAction=bulkSelectAction
|
||||
selected=selected
|
||||
skipHeader=skipHeader
|
||||
tagsForUser=tagsForUser
|
||||
changeSort=changeSort
|
||||
toggleBulkSelect=toggleBulkSelect
|
||||
unassign=unassign
|
||||
reassign=reassign
|
||||
onScroll=onScroll
|
||||
scrollOnLoad=scrollOnLoad
|
||||
}}
|
||||
<AssignedTopicList
|
||||
@showPosters={{showPosters}}
|
||||
@hideCategory={{hideCategory}}
|
||||
@topics={{topics}}
|
||||
@expandExcerpts={{expandExcerpts}}
|
||||
@bulkSelectEnabled={{bulkSelectEnabled}}
|
||||
@canBulkSelect={{canBulkSelect}}
|
||||
@bulkSelectAction={{bulkSelectAction}}
|
||||
@selected={{selected}}
|
||||
@skipHeader={{skipHeader}}
|
||||
@tagsForUser={{tagsForUser}}
|
||||
@changeSort={{changeSort}}
|
||||
@toggleBulkSelect={{toggleBulkSelect}}
|
||||
@unassign={{unassign}}
|
||||
@reassign={{reassign}}
|
||||
@onScroll={{onScroll}}
|
||||
@scrollOnLoad={{scrollOnLoad}}
|
||||
/>
|
||||
{{else}}
|
||||
{{#unless loadingMore}}
|
||||
<div class="alert alert-info">
|
||||
|
|
|
@ -16,25 +16,25 @@
|
|||
@action={{action "loadMore"}}
|
||||
>
|
||||
|
||||
{{basic-assigned-topic-list
|
||||
topicList=model
|
||||
hideCategory=hideCategory
|
||||
showPosters=showPosters
|
||||
bulkSelectEnabled=bulkSelectEnabled
|
||||
canBulkSelect=canBulkSelect
|
||||
selected=selected
|
||||
hasIncoming=hasIncoming
|
||||
incomingCount=incomingCount
|
||||
showInserted=(action "showInserted")
|
||||
tagsForUser=tagsForUser
|
||||
changeSort=(action "changeSort")
|
||||
toggleBulkSelect=(action "toggleBulkSelect")
|
||||
bulkSelectAction=(action "refresh")
|
||||
unassign=(action "unassign")
|
||||
reassign=(action "reassign")
|
||||
onScroll=saveScrollPosition
|
||||
scrollOnLoad=true
|
||||
}}
|
||||
<BasicAssignedTopicList
|
||||
@topicList={{model}}
|
||||
@hideCategory={{hideCategory}}
|
||||
@showPosters={{showPosters}}
|
||||
@bulkSelectEnabled={{bulkSelectEnabled}}
|
||||
@canBulkSelect={{canBulkSelect}}
|
||||
@selected={{selected}}
|
||||
@hasIncoming={{hasIncoming}}
|
||||
@incomingCount={{incomingCount}}
|
||||
@showInserted={{action "showInserted"}}
|
||||
@tagsForUser={{tagsForUser}}
|
||||
@changeSort={{action "changeSort"}}
|
||||
@toggleBulkSelect={{action "toggleBulkSelect"}}
|
||||
@bulkSelectAction={{action "refresh"}}
|
||||
@unassign={{action "unassign"}}
|
||||
@reassign={{action "reassign"}}
|
||||
@onScroll={{saveScrollPosition}}
|
||||
@scrollOnLoad={{true}}
|
||||
/>
|
||||
|
||||
<ConditionalLoadingSpinner @condition={{model.loadingMore}} />
|
||||
</LoadMore>
|
|
@ -17,34 +17,34 @@
|
|||
</div>
|
||||
{{/if}}
|
||||
<LoadMore @selector=".activity-nav li" @action={{action "loadMore"}}>
|
||||
{{group-assigned-filter
|
||||
showAvatar=false
|
||||
filter="everyone"
|
||||
routeType=route_type
|
||||
assignmentCount=group.assignment_count
|
||||
search=search
|
||||
ascending=ascending
|
||||
order=order
|
||||
}}
|
||||
{{group-assigned-filter
|
||||
showAvatar=false
|
||||
groupName=group.name
|
||||
filter=group.name
|
||||
routeType=route_type
|
||||
assignmentCount=group.group_assignment_count
|
||||
search=search
|
||||
ascending=ascending
|
||||
order=order
|
||||
}}
|
||||
<GroupAssignedFilter
|
||||
@showAvatar={{false}}
|
||||
@filter="everyone"
|
||||
@routeType={{route_type}}
|
||||
@assignmentCount={{group.assignment_count}}
|
||||
@search={{search}}
|
||||
@ascending={{ascending}}
|
||||
@order={{order}}
|
||||
/>
|
||||
<GroupAssignedFilter
|
||||
@showAvatar={{false}}
|
||||
@groupName={{group.name}}
|
||||
@filter={{group.name}}
|
||||
@routeType={{route_type}}
|
||||
@assignmentCount={{group.group_assignment_count}}
|
||||
@search={{search}}
|
||||
@ascending={{ascending}}
|
||||
@order={{order}}
|
||||
/>
|
||||
{{#each members as |member|}}
|
||||
{{group-assigned-filter
|
||||
showAvatar=true
|
||||
filter=member
|
||||
routeType=route_type
|
||||
search=search
|
||||
ascending=ascending
|
||||
order=order
|
||||
}}
|
||||
<GroupAssignedFilter
|
||||
@showAvatar={{true}}
|
||||
@filter={{member}}
|
||||
@routeType={{route_type}}
|
||||
@search={{search}}
|
||||
@ascending={{ascending}}
|
||||
@order={{order}}
|
||||
/>
|
||||
{{/each}}
|
||||
<ConditionalLoadingSpinner @condition={{loading}} />
|
||||
</LoadMore>
|
||||
|
|
|
@ -28,22 +28,22 @@
|
|||
</div>
|
||||
<div class="pull-right topic-list-num">
|
||||
{{#if topic.assigned_to_user}}
|
||||
{{assign-actions-dropdown
|
||||
topic=topic
|
||||
assignee=topic.assigned_to_user.username
|
||||
unassign=unassign
|
||||
reassign=reassign
|
||||
}}
|
||||
<AssignActionsDropdown
|
||||
@topic={{topic}}
|
||||
@assignee={{topic.assigned_to_user.username}}
|
||||
@unassign={{unassign}}
|
||||
@reassign={{reassign}}
|
||||
/>
|
||||
{{else if topic.assigned_to_group}}
|
||||
{{assign-actions-dropdown
|
||||
topic=topic
|
||||
assignee=topic.assigned_to_group.name
|
||||
group=true
|
||||
unassign=unassign
|
||||
reassign=reassign
|
||||
}}
|
||||
<AssignActionsDropdown
|
||||
@topic={{topic}}
|
||||
@assignee={{topic.assigned_to_group.name}}
|
||||
@group={{true}}
|
||||
@unassign={{unassign}}
|
||||
@reassign={{reassign}}
|
||||
/>
|
||||
{{else}}
|
||||
{{assign-actions-dropdown topic=topic unassign=unassign}}
|
||||
<AssignActionsDropdown @topic={{topic}} @unassign={{unassign}} />
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
|
|
|
@ -15,16 +15,16 @@
|
|||
<table class="topic-list assigned-topic-list">
|
||||
<tbody class="topic-list-body assigned-topic-list-body">
|
||||
{{#each topics as |t|}}
|
||||
{{assigned-topic-list-item
|
||||
topic=t
|
||||
expandGloballyPinned=expandGloballyPinned
|
||||
expandAllPinned=expandAllPinned
|
||||
lastVisitedTopic=lastVisitedTopic
|
||||
selected=selected
|
||||
tagsForUser=tagsForUser
|
||||
unassign=unassign
|
||||
reassign=reassign
|
||||
}}
|
||||
<AssignedTopicListItem
|
||||
@topic={{t}}
|
||||
@expandGloballyPinned={{expandGloballyPinned}}
|
||||
@expandAllPinned={{expandAllPinned}}
|
||||
@lastVisitedTopic={{lastVisitedTopic}}
|
||||
@selected={{selected}}
|
||||
@tagsForUser={{tagsForUser}}
|
||||
@unassign={{unassign}}
|
||||
@reassign={{reassign}}
|
||||
/>
|
||||
{{/each}}
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
<div>
|
||||
<div class="control-group {{if this.assigneeError 'assignee-error'}}">
|
||||
<label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label>
|
||||
{{assignee-chooser
|
||||
<AssigneeChooser
|
||||
autocomplete="off"
|
||||
value=assigneeName
|
||||
onChange=(action "assignUsername")
|
||||
@value={{assigneeName}}
|
||||
@onChange={{action "assignUsername"}}
|
||||
autofocus="autofocus"
|
||||
showUserStatus=true
|
||||
options=(hash
|
||||
@showUserStatus={{true}}
|
||||
@options={{hash
|
||||
mobilePlacementStrategy="absolute"
|
||||
filterPlaceholder=placeholderKey
|
||||
includeGroups=true
|
||||
|
@ -22,8 +22,8 @@
|
|||
expandedOnInsert=(not assigneeName)
|
||||
caretUpIcon="search"
|
||||
caretDownIcon="search"
|
||||
)
|
||||
}}
|
||||
}}
|
||||
/>
|
||||
{{#if this.assigneeError}}
|
||||
<span class="error-label">
|
||||
{{d-icon "exclamation-triangle"}}
|
||||
|
|
|
@ -22,22 +22,22 @@
|
|||
@selector=".paginated-topics-list .topic-list tr"
|
||||
@action={{action "loadMore"}}
|
||||
>
|
||||
{{basic-assigned-topic-list
|
||||
topicList=model
|
||||
hideCategory=hideCategory
|
||||
showPosters=true
|
||||
bulkSelectEnabled=bulkSelectEnabled
|
||||
selected=selected
|
||||
hasIncoming=hasIncoming
|
||||
incomingCount=incomingCount
|
||||
showInserted=(action "showInserted")
|
||||
tagsForUser=tagsForUser
|
||||
changeSort=(action "changeSort")
|
||||
unassign=(action "unassign")
|
||||
reassign=(action "reassign")
|
||||
onScroll=saveScrollPosition
|
||||
scrollOnLoad=true
|
||||
}}
|
||||
<BasicAssignedTopicList
|
||||
@topicList={{model}}
|
||||
@hideCategory={{hideCategory}}
|
||||
@showPosters={{true}}
|
||||
@bulkSelectEnabled={{bulkSelectEnabled}}
|
||||
@selected={{selected}}
|
||||
@hasIncoming={{hasIncoming}}
|
||||
@incomingCount={{incomingCount}}
|
||||
@showInserted={{action "showInserted"}}
|
||||
@tagsForUser={{tagsForUser}}
|
||||
@changeSort={{action "changeSort"}}
|
||||
@unassign={{action "unassign"}}
|
||||
@reassign={{action "reassign"}}
|
||||
@onScroll={{saveScrollPosition}}
|
||||
@scrollOnLoad={{true}}
|
||||
/>
|
||||
|
||||
<ConditionalLoadingSpinner @condition={{model.loadingMore}} />
|
||||
</LoadMore>
|
||||
|
|
|
@ -5,6 +5,6 @@
|
|||
"author": "Discourse",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"eslint-config-discourse": "^3.3.0"
|
||||
"eslint-config-discourse": "^3.4.0"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1145,7 +1145,7 @@ escape-string-regexp@^4.0.0:
|
|||
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
|
||||
integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
|
||||
|
||||
eslint-config-discourse@^3.3.0:
|
||||
eslint-config-discourse@^3.4.0:
|
||||
version "3.4.0"
|
||||
resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-3.4.0.tgz#636a1824bca48c90aeac5bee2f8d7b993609191f"
|
||||
integrity sha512-9jwu8GQPDOxAO0ByV6RbInu5r39HrFvbAHQRJ8YoGg2fuvHcX+p7fYcxEWj64LhmF4qD55cAGhN0Gmj10RVjoQ==
|
||||
|
|
Loading…
Reference in New Issue