IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Some select-box headers don't need a class (#12992)

Browse Source 
* DEV: Some select-box headers don't need a class

* remove duplicate class
This commit is contained in:
Kris 2021-05-20 02:00:45 -04:00 committed by GitHub
parent 626b8465ba
commit a532e64389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/select-kit/addon/components/composer-actions.js
View File

@ -37,6 +37,7 @@ export default DropdownSelectBoxComponent.extend({
filterable: false, filterable: false,
showFullTitle: false, showFullTitle: false,
preventHeaderFocus: true, preventHeaderFocus: true,
customStyle: true,
}, },
@discourseComputed("isEditing", "action", "whisper", "noBump", "isInSlowMode") @discourseComputed("isEditing", "action", "whisper", "noBump", "isInSlowMode")

9
app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.js
View File

@ -5,17 +5,22 @@ import { readOnly } from "@ember/object/computed";
export default SingleSelectHeaderComponent.extend({ export default SingleSelectHeaderComponent.extend({
layout, layout,
classNames: ["btn-default", "dropdown-select-box-header"], classNames: ["dropdown-select-box-header"],
tagName: "button", tagName: "button",
classNameBindings: ["btnClassName"], classNameBindings: ["btnClassName", "btnStyleClass"],
showFullTitle: readOnly("selectKit.options.showFullTitle"), showFullTitle: readOnly("selectKit.options.showFullTitle"),
attributeBindings: ["buttonType:type"], attributeBindings: ["buttonType:type"],
buttonType: "button", buttonType: "button",
customStyle: readOnly("selectKit.options.customStyle"),
btnClassName: computed("showFullTitle", function () { btnClassName: computed("showFullTitle", function () {
return `btn ${this.showFullTitle ? "btn-icon-text" : "no-text btn-icon"}`; return `btn ${this.showFullTitle ? "btn-icon-text" : "no-text btn-icon"}`;
}), }),
btnStyleClass: computed("customStyle", function () {
return `${this.customStyle ? "" : "btn-default"}`;
}),
caretUpIcon: readOnly("selectKit.options.caretUpIcon"), caretUpIcon: readOnly("selectKit.options.caretUpIcon"),
caretDownIcon: readOnly("selectKit.options.caretDownIcon"), caretDownIcon: readOnly("selectKit.options.caretDownIcon"),

1
app/assets/javascripts/select-kit/addon/components/period-chooser.js
View File

@ -18,6 +18,7 @@ export default DropdownSelectBoxComponent.extend({
filterable: false, filterable: false,
autoFilterable: false, autoFilterable: false,
fullDay: "fullDay", fullDay: "fullDay",
customStyle: true,
headerComponent: "period-chooser/period-chooser-header", headerComponent: "period-chooser/period-chooser-header",
}, },

1
app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
View File

@ -10,6 +10,7 @@ export default DropdownSelectBoxComponent.extend({
filterable: false, filterable: false,
autoFilterable: false, autoFilterable: false,
preventHeaderFocus: true, preventHeaderFocus: true,
customStyle: true,
}, },
modifyContent(contents) { modifyContent(contents) {