Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 18:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

♻️ fix https://github.com/siyuan-note/siyuan/pull/11733

Browse source
This commit is contained in:
Vanessa 2024-07-05 21:00:21 +08:00
parent f25b36ff38
commit cd40ec50bb
21 changed files with 341 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app/src/window/index.ts
View file

@ -28,9 +28,6 @@ class App {
constructor() {
addBaseURL();
addScriptSync(`${Constants.PROTYLE_CDN}/js/lute/lute.min.js?v=${Constants.SIYUAN_VERSION}`, "protyleLuteScript");
addScript(`${Constants.PROTYLE_CDN}/js/protyle-html.js?v=${Constants.SIYUAN_VERSION}`, "protyleWcHtmlScript");
this.appId = Constants.SIYUAN_APPID;
window.siyuan = {
zIndex: 10,
@ -146,35 +143,22 @@ class App {
}),
};
fetchPost("/api/system/getConf", {}, async (response) => {
addScriptSync(`${Constants.PROTYLE_CDN}/js/lute/lute.min.js?v=${Constants.SIYUAN_VERSION}`, "protyleLuteScript");
addScript(`${Constants.PROTYLE_CDN}/js/protyle-html.js?v=${Constants.SIYUAN_VERSION}`, "protyleWcHtmlScript");
window.siyuan.config = response.data.conf;
const promises = [
loadPlugins(this),
new Promise<void>(resolve => getLocalStorage(resolve)),
new Promise<void>(resolve => fetchGet(
`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`,
(lauguages: IObject) => {
window.siyuan.languages = lauguages;
resolve();
},
)),
];
if (!window.siyuan.config.readonly) {
promises.push(new Promise<void>(resolve => {
await loadPlugins(this);
getLocalStorage(() => {
fetchGet(`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`, (lauguages: IObject) => {
window.siyuan.languages = lauguages;
window.siyuan.menus = new Menus(this);
fetchPost("/api/setting/getCloudUser", {}, userResponse => {
window.siyuan.user = userResponse.data;
resolve();
init(this);
setTitle(window.siyuan.languages.siyuanNote);
initMessage();
});
}));
}
await Promise.all(promises);
window.siyuan.menus = new Menus(this);
init(this);
setTitle(window.siyuan.languages.siyuanNote);
initMessage();
});
});
});
setNoteBook();
initBlockPopover(this);