Skip to content

Commit

Permalink
🐛 mobile
Browse files Browse the repository at this point in the history
  • Loading branch information
Vanessa219 committed Oct 15, 2023
1 parent d316585 commit 8457cbc
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 4 deletions.
11 changes: 9 additions & 2 deletions app/src/protyle/render/av/action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ import {showMessage} from "../../../dialog/message";
import {previewImage} from "../../preview/image";
import {isLocalPath, pathPosix} from "../../../util/pathName";
import {Constants} from "../../../constants";
/// #if !MOBILE
import {openAsset} from "../../../editor/util";
import {getSearch, isMobile} from "../../../util/functions";
/// #endif
import {getSearch} from "../../../util/functions";
import {unicode2Emoji} from "../../../emoji";
import {selectRow} from "./row";
import * as dayjs from "dayjs";
Expand Down Expand Up @@ -126,8 +128,9 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle
} else if (linkElement.classList.contains("b3-chip")) {
linkAddress = linkElement.dataset.url;
}
/// #if !MOBILE
const suffix = pathPosix().extname(linkAddress);
if (isLocalPath(linkAddress) && !isMobile() && (
if (isLocalPath(linkAddress) && (
[".pdf"].concat(Constants.SIYUAN_ASSETS_AUDIO).concat(Constants.SIYUAN_ASSETS_VIDEO).includes(suffix) && (
suffix !== ".pdf" || (suffix === ".pdf" && !linkAddress.startsWith("file://"))
)
Expand All @@ -136,6 +139,10 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle
} else {
window.open(linkAddress);
}
/// #else
window.open(linkAddress);
/// #endif

event.preventDefault();
event.stopPropagation();
return true;
Expand Down
14 changes: 12 additions & 2 deletions app/src/protyle/render/av/openMenuPanel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ import {Constants} from "../../../constants";
import {hideElements} from "../../ui/hideElements";
import {isLocalPath, pathPosix} from "../../../util/pathName";
import {openEmojiPanel, unicode2Emoji} from "../../../emoji";
import {getSearch, isMobile} from "../../../util/functions";
import {getSearch} from "../../../util/functions";
/// #if !MOBILE
import {openAsset} from "../../../editor/util";
/// #endif
import {previewImage} from "../../preview/image";

export const openMenuPanel = (options: {
Expand Down Expand Up @@ -747,7 +749,8 @@ export const openMenuPanel = (options: {
} else if (type === "openAssetItem") {
const assetLink = target.parentElement.dataset.content;
const suffix = pathPosix().extname(assetLink);
if (isLocalPath(assetLink) && !isMobile() && (
/// #if !MOBILE
if (isLocalPath(assetLink) && (
[".pdf"].concat(Constants.SIYUAN_ASSETS_AUDIO).concat(Constants.SIYUAN_ASSETS_VIDEO).includes(suffix) && (
suffix !== ".pdf" || ( suffix === ".pdf" && !assetLink.startsWith("file://"))
)
Expand All @@ -758,6 +761,13 @@ export const openMenuPanel = (options: {
} else {
window.open(assetLink);
}
/// #else
if (Constants.SIYUAN_ASSETS_IMAGE.includes(suffix)) {
previewImage(assetLink);
} else {
window.open(assetLink);
}
/// #endif
event.preventDefault();
event.stopPropagation();
break;
Expand Down

0 comments on commit 8457cbc

Please sign in to comment.