github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-29 01:31:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: ensure s2 is working with wizard (#8886)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2020-02-07 10:00:39 +01:00
committed by GitHub
parent a0e0b1ef4b
commit d86ed028c7
7 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/assets/javascripts/discourse/helpers/component-for-collection.js.es6 → app/assets/javascripts/discourse-common/helpers/component-for-collection.js.es6
View File

0
app/assets/javascripts/discourse/helpers/component-for-row.js.es6 → app/assets/javascripts/discourse-common/helpers/component-for-row.js.es6
View File

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

@ -774,13 +774,17 @@ export default Component.extend(
`[data-select-kit-id=${this.selectKit.uniqueID}-body]` `[data-select-kit-id=${this.selectKit.uniqueID}-body]`
); );
if (!this.site.mobileView && popper.offsetWidth < anchor.offsetWidth) { if (
this.site &&
!this.site.mobileView &&
popper.offsetWidth < anchor.offsetWidth
) {
popper.style.minWidth = `${anchor.offsetWidth}px`; popper.style.minWidth = `${anchor.offsetWidth}px`;
} }
const inModal = $(this.element).parents("#discourse-modal").length; const inModal = $(this.element).parents("#discourse-modal").length;
if (!this.site.mobileView && inModal) { if (this.site && !this.site.mobileView && inModal) {
popper.style.width = `${anchor.offsetWidth}px`; popper.style.width = `${anchor.offsetWidth}px`;
} }

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

@ -1,4 +1,3 @@
import { fmt } from "discourse/lib/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { isEmpty } from "@ember/utils"; import { isEmpty } from "@ember/utils";
@ -11,7 +10,9 @@ export default Component.extend(UtilsMixin, {
classNames: ["select-kit-filter"], classNames: ["select-kit-filter"],
classNameBindings: ["isExpanded:is-expanded"], classNameBindings: ["isExpanded:is-expanded"],
attributeBindings: ["selectKitId:data-select-kit-id"], attributeBindings: ["selectKitId:data-select-kit-id"],
selectKitId: fmt("selectKit.uniqueID", "%@-filter"), selectKitId: computed("selectKit.uniqueID", function() {
return `${this.selectKit.uniqueID}-filter`;
}),
isHidden: computed( isHidden: computed(
"selectKit.options.{filterable,allowAny,autoFilterable}", "selectKit.options.{filterable,allowAny,autoFilterable}",

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

@ -1,5 +1,4 @@
import Component from "@ember/component"; import Component from "@ember/component";
import { propertyEqual } from "discourse/lib/computed";
import { computed } from "@ember/object"; import { computed } from "@ember/object";
import { makeArray } from "discourse-common/lib/helpers"; import { makeArray } from "discourse-common/lib/helpers";
import { guidFor } from "@ember/object/internals"; import { guidFor } from "@ember/object/internals";
@ -74,9 +73,13 @@ export default Component.extend(UtilsMixin, {
return this.getValue(this.selectKit.highlighted); 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;
}),
mouseEnter() { mouseEnter() {
if (!this.isDestroying || !this.isDestroyed) { if (!this.isDestroying || !this.isDestroyed) {

4
app/assets/javascripts/select-kit/templates/components/single-select.hbs
View File

@ -27,7 +27,9 @@
{{/each}} {{/each}}
{{else}} {{else}}
<span class="is-loading"> <span class="is-loading">
{{loading-spinner size="small"}} {{#if site}}
{{loading-spinner size="small"}}
{{/if}}
</span> </span>
{{/unless}} {{/unless}}
{{/select-kit/select-kit-body}} {{/select-kit/select-kit-body}}

1
app/assets/javascripts/wizard-vendor.js
View File

@ -4,3 +4,4 @@
//= require sweetalert.js //= require sweetalert.js
//= require virtual-dom //= require virtual-dom
//= require virtual-dom-amd //= require virtual-dom-amd
//= require popper