github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 22:26:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: allows to define placement strategy of select-kit body (#9109)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2020-03-06 20:27:33 +01:00 committed by GitHub
parent 29c9d8a133
commit bb5990781e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
View File

@ -29,6 +29,9 @@
value=selectedGroup
valueProperty=null
nameProperty=null
options=(hash
placementStrategy="absolute"
)
}}
{{combo-box
class="permission-selector"
@ -36,6 +39,9 @@
content=category.availablePermissions
onChange=(action "onSelectPermission")
value=selectedPermission
options=(hash
placementStrategy="absolute"
)
}}
{{d-button
action=(action "addPermission" selectedGroup selectedPermission)

44
app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
View File

@ -39,6 +39,9 @@
content=searchPrioritiesOptions
value=category.search_priority
onChange=(action (mut category.search_priority))
options=(hash
placementStrategy="absolute"
)
}}
</div>
</section>
@ -148,7 +151,15 @@
{{i18n "category.default_view"}}
</label>
<div class="controls">
{{combo-box valueProperty="value" id="category-default-view" content=availableViews value=category.default_view}}
{{combo-box
valueProperty="value"
id="category-default-view"
content=availableViews
value=category.default_view
options=(hash
placementStrategy="absolute"
)
}}
</div>
</section>
@ -157,7 +168,15 @@
{{i18n "category.default_top_period"}}
</label>
<div class="controls">
{{combo-box valueProperty="value" id="category-default-period" content=availableTopPeriods value=category.default_top_period}}
{{combo-box
valueProperty="value"
id="category-default-period"
content=availableTopPeriods
value=category.default_top_period
options=(hash
placementStrategy="absolute"
)
}}
</div>
</section>
@ -168,7 +187,16 @@
<div class="controls">
{{combo-box valueProperty="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
{{#unless isDefaultSortOrder}}
{{combo-box castBoolean=true valueProperty="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}}
{{combo-box
castBoolean=true
valueProperty="value"
content=sortAscendingOptions
value=category.sort_ascending
none="category.sort_options.default"
options=(hash
placementStrategy="absolute"
)
}}
{{/unless}}
</div>
</section>
@ -187,7 +215,15 @@
<label for="subcategory-list-style">
{{i18n "category.subcategory_list_style"}}
</label>
{{combo-box valueProperty="value" id="subcategory-list-style" content=availableSubcategoryListStyles value=category.subcategory_list_style}}
{{combo-box
valueProperty="value"
id="subcategory-list-style"
content=availableSubcategoryListStyles
value=category.subcategory_list_style
options=(hash
placementStrategy="absolute"
)
}}
</section>
{{/if}}

8
app/assets/javascripts/select-kit/components/select-kit.js.es6
View File

@ -267,6 +267,7 @@ export default Component.extend(
closeOnChange: true,
limitMatches: null,
placement: "bottom-start",
placementStrategy: null,
filterComponent: "select-kit/select-kit-filter",
selectedNameComponent: "selected-name",
castInteger: false
@ -814,10 +815,15 @@ export default Component.extend(
popper.style.width = `${anchor.offsetWidth}px`;
}
let placementStrategy = this.selectKit.options.placementStrategy;
if (!placementStrategy) {
placementStrategy = this.inModal ? "fixed" : "absolute";
}
/* global Popper:true */
this.popper = Popper.createPopper(anchor, popper, {
eventsEnabled: false,
strategy: inModal ? "fixed" : "absolute",
strategy: placementStrategy,
placement: this.selectKit.options.placement,
modifiers: [
{