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

FIX: sk3 wizard regressions (#14120)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2021-08-23 19:57:42 +02:00
committed by GitHub
parent 3d6cbb5ab3
commit a230362f65
3 changed files with 16 additions and 10 deletions
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

@@ -77,7 +77,7 @@ export default Component.extend(
this.set(
"selectKit",
EmberObject.create({
uniqueID: this.attrs?.id || guidFor(this),
uniqueID: this.attrs?.id?.value || this.attrs?.id || guidFor(this),
valueProperty: this.valueProperty,
nameProperty: this.nameProperty,
labelProperty: this.labelProperty,
@@ -838,7 +838,7 @@ export default Component.extend(
this.clearErrors();
const inModal = this.element.closest("#discourse-modal");
if (inModal && this.site.mobileView) {
if (inModal && this?.site?.mobileView) {
const modalBody = inModal.querySelector(".modal-body");
modalBody.style = "";
}
@@ -870,7 +870,7 @@ export default Component.extend(
`#${this.selectKit.uniqueID}-body`
);
const placementStrategy = this.site.mobileView ? "absolute" : "fixed";
const placementStrategy = this?.site?.mobileView ? "absolute" : "fixed";
const verticalOffset = 3;
this.popper = createPopper(anchor, popper, {

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

@@ -1,4 +1,3 @@
import { propertyEqual } from "discourse/lib/computed";
import { action, computed } from "@ember/object";
import Component from "@ember/component";
import I18n from "I18n";
@@ -36,7 +35,7 @@ export default Component.extend(UtilsMixin, {
didInsertElement() {
this._super(...arguments);
if (!this.site.mobileView) {
if (!this?.site?.mobileView) {
this.element.addEventListener("mouseenter", this.handleMouseEnter);
this.element.addEventListener("focus", this.handleMouseEnter);
this.element.addEventListener("blur", this.handleBlur);
@@ -45,7 +44,7 @@ export default Component.extend(UtilsMixin, {
willDestroyElement() {
this._super(...arguments);
if (!this.site.mobileView && this.element) {
if (!this?.site?.mobileView && this.element) {
this.element.removeEventListener("mouseenter", this.handleBlur);
this.element.removeEventListener("focus", this.handleMouseEnter);
this.element.removeEventListener("blur", this.handleMouseEnter);
@@ -115,9 +114,13 @@ export default Component.extend(UtilsMixin, {
return this.getValue(this.selectKit.highlighted);
}),
isHighlighted: propertyEqual("rowValue", "highlightedValue"),
isHighlighted: computed("rowValue", "highlightedValue", function () {
return this.rowValue === this.highlightedValue;
}),
isSelected: propertyEqual("rowValue", "value"),
isSelected: computed("rowValue", "value", function () {
return this.rowValue === this.value;
}),
@action
handleMouseEnter() {