Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: disabled option for sk was not working correctly (#10900) 

Name was incorrect and it was only removing cursor events and not changing style.
This commit is contained in:
Joffrey JAFFEUX 2020-10-13 11:31:07 +02:00 committed by GitHub
parent a6d9adf346
commit a73fd4227f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/select-kit/addon/components/select-kit.js
View File

@ -42,7 +42,7 @@ export default Component.extend(
classNameBindings: [ classNameBindings: [
"selectKit.isLoading:is-loading", "selectKit.isLoading:is-loading",
"selectKit.isExpanded:is-expanded", "selectKit.isExpanded:is-expanded",
"selectKit.isDisabled:is-disabled", "selectKit.options.disabled:is-disabled",
"selectKit.isHidden:is-hidden", "selectKit.isHidden:is-hidden",
"selectKit.hasSelection:has-selection", "selectKit.hasSelection:has-selection",
], ],
@ -178,8 +178,6 @@ export default Component.extend(
didUpdateAttrs() { didUpdateAttrs() {
this._super(...arguments); this._super(...arguments);
this.set("selectKit.isDisabled", this.isDisabled || false);
this.handleDeprecations(); this.handleDeprecations();
}, },
@ -985,7 +983,7 @@ export default Component.extend(
allowUncategorized: "options.allowUncategorized", allowUncategorized: "options.allowUncategorized",
none: "options.none", none: "options.none",
rootNone: "options.none", rootNone: "options.none",
isDisabled: "options.isDisabled", disabled: "options.disabled",
rootNoneLabel: "options.none", rootNoneLabel: "options.none",
showFullTitle: "options.showFullTitle", showFullTitle: "options.showFullTitle",
title: "options.translatedNone", title: "options.translatedNone",

6
app/assets/stylesheets/common/select-kit/single-select.scss
View File

@ -14,4 +14,10 @@
border-color: var(--tertiary); border-color: var(--tertiary);
} }
} }
&.is-disabled {
.select-kit-header {
opacity: 0.5;
}
}
} }