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

♻️ https://github.com/siyuan-note/siyuan/pull/7089/files

Browse source
This commit is contained in:
Vanessa 2023-01-17 00:23:21 +08:00
parent 67743b50ba
commit 2b06134a5a
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/asset/index.ts
View file

@ -9,7 +9,7 @@ import {webViewerLoad} from "./pdf/viewer";
import {webViewerPageNumberChanged} from "./pdf/app";
/// #endif
import {fetchPost} from "../util/fetch";
import { setStorageVal } from "../protyle/util/compatibility";
import {setStorageVal} from "../protyle/util/compatibility";
export class Asset extends Model {
public path: string;
@ -57,7 +57,7 @@ export class Asset extends Model {
}
public goToPage(pdfId: string | number) {
if (typeof pdfId === "undefined") {
if (typeof pdfId === "undefined" || pdfId === null) {
return;
}
this.pdfId = pdfId;
@ -68,7 +68,9 @@ export class Asset extends Model {
});
return;
}
webViewerPageNumberChanged({value: this.pdfId, pdfInstance: this.pdfObject});
if (typeof pdfId === "number" && !isNaN(pdfId)) {
webViewerPageNumberChanged({value: this.pdfId, pdfInstance: this.pdfObject});
}
/// #endif
}

4
app/src/layout/util.ts
View file

@ -299,12 +299,12 @@ export const JSONToLayout = (isStart: boolean) => {
});
}
// https://github.com/siyuan-note/siyuan/pull/7086
const openId = getSearch("id", window.location.href);
const openId = getSearch("id");
if (openId !== null) {
openFileById({
id: openId,
action: [Constants.CB_GET_FOCUS, Constants.CB_GET_CONTEXT],
zoomIn: getSearch("focus", window.location.href) === "1"
zoomIn: getSearch("focus") === "1"
});
}
};

4
app/src/mobile/util/initFramework.ts
View file

@ -128,10 +128,10 @@ export const initFramework = () => {
});
initEditorName();
if (getOpenNotebookCount() > 0) {
const openId = getSearch("id", window.location.href);
const openId = getSearch("id");
if (openId !== null) {
openMobileFileById(openId,
getSearch("focus", window.location.href) === "1" ? [Constants.CB_GET_ALL, Constants.CB_GET_FOCUS] : [Constants.CB_GET_FOCUS, Constants.CB_GET_CONTEXT]);
getSearch("focus") === "1" ? [Constants.CB_GET_ALL, Constants.CB_GET_FOCUS] : [Constants.CB_GET_FOCUS, Constants.CB_GET_CONTEXT]);
} else {
const localDoc = window.siyuan.storage[Constants.LOCAL_DOCINFO];
fetchPost("/api/block/checkBlockExist", {id: localDoc.id}, existResponse => {

3
app/src/protyle/wysiwyg/index.ts
View file

@ -1577,8 +1577,7 @@ export class WYSIWYG {
} else if (window.siyuan.shiftIsPressed) {
openBy(linkAddress, "app");
} else {
const page = getSearch("page", linkAddress);
openAsset(linkPathname, page === null ? undefined : parseInt(page), "right");
openAsset(linkPathname, parseInt(getSearch("page", linkAddress)), "right");
}
} else {
/// #if !BROWSER