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: Short URL resolution in cook-text (#10200)

Browse Source 
Regressed in 3b51e05de2. Thanks to @romanrizzi for reporting!
This commit is contained in:
Jarek Radosz
2020-07-09 14:39:13 +02:00
committed by GitHub
parent 4a9ee25c56
commit 32ee9fae40
2 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ 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";
import { afterRender } from "discourse-common/utils/decorators";
const CookText = Component.extend({
cooked: null,
@@ -10,11 +11,13 @@ const CookText = Component.extend({
this._super(...arguments);
cookAsync(this.rawText).then(cooked => {
this.set("cooked", cooked);
if (this.element && !this.isDestroying && !this.isDestroyed) {
return resolveAllShortUrls(ajax, this.siteSettings, this.element);
}
this._resolveUrls();
});
},
@afterRender
_resolveUrls() {
resolveAllShortUrls(ajax, this.siteSettings, this.element);
}
});