hopefully last merge fiasco cleanup
This commit is contained in:
parent
fbc13249ca
commit
b3a25a3bb3
1 changed files with 5 additions and 2 deletions
|
@ -589,7 +589,7 @@ function setupMarkdown() {
|
||||||
defs: emojiDefs,
|
defs: emojiDefs,
|
||||||
})
|
})
|
||||||
.disable("image");
|
.disable("image");
|
||||||
var defaultRenderer = md.renderer.rules.image;
|
const defaultRenderer = md.renderer.rules.image;
|
||||||
md.renderer.rules.image = function (
|
md.renderer.rules.image = function (
|
||||||
tokens: Token[],
|
tokens: Token[],
|
||||||
idx: number,
|
idx: number,
|
||||||
|
@ -608,6 +608,9 @@ function setupMarkdown() {
|
||||||
const alt_text = item.content;
|
const alt_text = item.content;
|
||||||
return `<img class="icon icon-emoji" src="${src}" title="${title}" alt="${alt_text}"/>`;
|
return `<img class="icon icon-emoji" src="${src}" title="${title}" alt="${alt_text}"/>`;
|
||||||
};
|
};
|
||||||
|
md.renderer.rules.table_open = function () {
|
||||||
|
return '<table class="table">';
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getEmojiMart(
|
export function getEmojiMart(
|
||||||
|
@ -1119,7 +1122,7 @@ export function personSelectName({
|
||||||
|
|
||||||
export function initializeSite(site?: GetSiteResponse) {
|
export function initializeSite(site?: GetSiteResponse) {
|
||||||
UserService.Instance.myUserInfo = site?.my_user;
|
UserService.Instance.myUserInfo = site?.my_user;
|
||||||
i18n.changeLanguage(getLanguages()[0]);
|
i18n.changeLanguage();
|
||||||
if (site) {
|
if (site) {
|
||||||
setupEmojiDataModel(site.custom_emojis ?? []);
|
setupEmojiDataModel(site.custom_emojis ?? []);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue