mirror of
https://github.com/discourse/discourse.git
synced 2024-11-30 20:54:00 -06:00
FIX: Don't throw errors on wizard dropdowns (#16994)
This commit is contained in:
parent
17227e9e53
commit
f4b9d4e285
@ -4,7 +4,7 @@ import {
|
||||
darkLightDiff,
|
||||
} from "wizard/lib/preview";
|
||||
import I18n from "I18n";
|
||||
import { observes } from "discourse-common/utils/decorators";
|
||||
import { bind, observes } from "discourse-common/utils/decorators";
|
||||
|
||||
const LOREM = `
|
||||
Lorem ipsum dolor sit amet, consectetur adipiscing.
|
||||
@ -20,6 +20,16 @@ export default createPreviewComponent(659, 320, {
|
||||
startX: 0,
|
||||
scrollLeft: 0,
|
||||
|
||||
init() {
|
||||
this._super(...arguments);
|
||||
this.wizard.on("homepageStyleChanged", this.onHomepageStyleChange);
|
||||
},
|
||||
|
||||
willDestroy() {
|
||||
this._super(...arguments);
|
||||
this.wizard.off("homepageStyleChanged", this.onHomepageStyleChange);
|
||||
},
|
||||
|
||||
mouseDown(e) {
|
||||
const slider = this.element.querySelector(".previews");
|
||||
this.setProperties({
|
||||
@ -61,10 +71,11 @@ export default createPreviewComponent(659, 320, {
|
||||
this._super(...arguments);
|
||||
|
||||
this.triggerRepaint();
|
||||
},
|
||||
|
||||
if (this.stylingDropdown?.id === "homepage_style") {
|
||||
@bind
|
||||
onHomepageStyleChange() {
|
||||
this.set("previewTopic", false);
|
||||
}
|
||||
},
|
||||
|
||||
@observes("previewTopic")
|
||||
|
@ -30,7 +30,10 @@ export default Component.extend({
|
||||
actions: {
|
||||
onChangeValue(value) {
|
||||
this.set("field.value", value);
|
||||
this.stylingDropdownChanged(this.field.id, value);
|
||||
|
||||
if (this.field.id === "homepage_style") {
|
||||
this.wizard.trigger("homepageStyleChanged");
|
||||
}
|
||||
},
|
||||
},
|
||||
});
|
||||
|
@ -11,11 +11,6 @@ export default Component.extend({
|
||||
classNames: ["wizard-step"],
|
||||
saving: null,
|
||||
|
||||
init() {
|
||||
this._super(...arguments);
|
||||
this.set("stylingDropdown", {});
|
||||
},
|
||||
|
||||
didInsertElement() {
|
||||
this._super(...arguments);
|
||||
this.autoFocus();
|
||||
@ -117,10 +112,6 @@ export default Component.extend({
|
||||
document.location = getUrl("/");
|
||||
},
|
||||
|
||||
stylingDropdownChanged(id, value) {
|
||||
this.set("stylingDropdown", { id, value });
|
||||
},
|
||||
|
||||
exitEarly() {
|
||||
const step = this.step;
|
||||
step.validate();
|
||||
|
@ -1,10 +1,11 @@
|
||||
import EmberObject from "@ember/object";
|
||||
import Evented from "@ember/object/evented";
|
||||
import Step from "wizard/models/step";
|
||||
import WizardField from "wizard/models/wizard-field";
|
||||
import { ajax } from "wizard/lib/ajax";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
|
||||
const Wizard = EmberObject.extend({
|
||||
const Wizard = EmberObject.extend(Evented, {
|
||||
@discourseComputed("steps.length")
|
||||
totalSteps: (length) => length,
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
{{homepage-preview
|
||||
wizard=wizard
|
||||
step=step
|
||||
stylingDropdown=stylingDropdown
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
|
@ -15,11 +15,10 @@
|
||||
<div class="input-area">
|
||||
{{component
|
||||
inputComponentName
|
||||
field=field step=step
|
||||
field=field
|
||||
step=step
|
||||
fieldClass=fieldClass
|
||||
wizard=wizard
|
||||
stylingDropdownChanged=stylingDropdownChanged
|
||||
stylingDropdown=stylingDropdown
|
||||
}}
|
||||
</div>
|
||||
|
||||
|
@ -22,7 +22,6 @@
|
||||
field=field
|
||||
step=step
|
||||
wizard=wizard
|
||||
stylingDropdownChanged=(action "stylingDropdownChanged")
|
||||
}}
|
||||
{{/if}}
|
||||
{{/each}}
|
||||
@ -35,7 +34,6 @@
|
||||
field=field
|
||||
step=step
|
||||
wizard=wizard
|
||||
stylingDropdown=stylingDropdown
|
||||
}}
|
||||
{{/unless}}
|
||||
{{/each}}
|
||||
|
Loading…
Reference in New Issue
Block a user