github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 23:02:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: CookText may be gone before promise resolves (#10097)

Browse Source 
* FIX: CookText may be gone before promise resolves

Bug introduced in 293467a37a.

* DEV: Drop the window.requireModule in cook-text

It was introduced in 2017 in 232311aa8c but doesn't seem to be necessary anymore.
This commit is contained in:
Jarek Radosz 2020-07-06 17:03:27 +02:00 committed by GitHub
parent 64ce12a758
commit 3b51e05de2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/app/components/cook-text.js
View File

@ -1,7 +1,7 @@
import { next } from "@ember/runloop";
import Component from "@ember/component";
import { cookAsync } from "discourse/lib/text";
import { ajax } from "discourse/lib/ajax";
import { resolveAllShortUrls } from "pretty-text/upload-short-url";
const CookText = Component.extend({
cooked: null,
@ -10,13 +10,10 @@ const CookText = Component.extend({
this._super(...arguments);
cookAsync(this.rawText).then(cooked => {
this.set("cooked", cooked);
// no choice but to defer this cause
// pretty text may only be loaded now
next(() =>
window
.requireModule("pretty-text/upload-short-url")
.resolveAllShortUrls(ajax, this.siteSettings, this.element)
);
if (this.element && !this.isDestroying && !this.isDestroyed) {
return resolveAllShortUrls(ajax, this.siteSettings, this.element);
}
});
}
});