0
0
Fork 1
Spiegel von https://github.com/paviliondev/discourse-custom-wizard.git synchronisiert 2024-11-09 20:02:54 +01:00

Merge branch 'main' into master

Dieser Commit ist enthalten in:
Angus McLeod 2023-10-16 09:14:21 +08:00 committet von GitHub
Commit 62f2baf9e7
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
3 geänderte Dateien mit 6 neuen und 5 gelöschten Zeilen

Datei anzeigen

@ -1,3 +1,4 @@
3.2.0.beta2: 1ee2f7d8babafe32912372fbbfa50c89f5b09ba9
3.1.999: 1f35b80f85e5fd1efb7f4851f0845700432febdc 3.1.999: 1f35b80f85e5fd1efb7f4851f0845700432febdc
2.7.99: e07a57e398b6b1676ab42a7e34467556fca5416b 2.7.99: e07a57e398b6b1676ab42a7e34467556fca5416b
2.5.1: bb85b3a0d2c0ab6b59bcb405731c39089ec6731c 2.5.1: bb85b3a0d2c0ab6b59bcb405731c39089ec6731c

Datei anzeigen

@ -1,7 +1,7 @@
import Component from "@ember/component"; import Component from "@ember/component";
import { dasherize } from "@ember/string"; import { dasherize } from "@ember/string";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { cookAsync } from "discourse/lib/text"; import { cook } from "discourse/lib/text";
export default Component.extend({ export default Component.extend({
classNameBindings: [ classNameBindings: [
@ -14,7 +14,7 @@ export default Component.extend({
didReceiveAttrs() { didReceiveAttrs() {
this._super(...arguments); this._super(...arguments);
cookAsync(this.field.translatedDescription).then((cookedDescription) => { cook(this.field.translatedDescription).then((cookedDescription) => {
this.set("cookedDescription", cookedDescription); this.set("cookedDescription", cookedDescription);
}); });
}, },

Datei anzeigen

@ -4,7 +4,7 @@ import I18n from "I18n";
import getUrl from "discourse-common/lib/get-url"; import getUrl from "discourse-common/lib/get-url";
import { htmlSafe } from "@ember/template"; import { htmlSafe } from "@ember/template";
import { schedule } from "@ember/runloop"; import { schedule } from "@ember/runloop";
import { cookAsync } from "discourse/lib/text"; import { cook } from "discourse/lib/text";
import CustomWizard, { import CustomWizard, {
updateCachedWizard, updateCachedWizard,
} from "discourse/plugins/discourse-custom-wizard/discourse/models/custom-wizard"; } from "discourse/plugins/discourse-custom-wizard/discourse/models/custom-wizard";
@ -25,10 +25,10 @@ export default Component.extend({
didReceiveAttrs() { didReceiveAttrs() {
this._super(...arguments); this._super(...arguments);
cookAsync(this.step.translatedTitle).then((cookedTitle) => { cook(this.step.translatedTitle).then((cookedTitle) => {
this.set("cookedTitle", cookedTitle); this.set("cookedTitle", cookedTitle);
}); });
cookAsync(this.step.translatedDescription).then((cookedDescription) => { cook(this.step.translatedDescription).then((cookedDescription) => {
this.set("cookedDescription", cookedDescription); this.set("cookedDescription", cookedDescription);
}); });
}, },