renun/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-02-28 05:32:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

📱 fix https://github.com/siyuan-note/siyuan/issues/6709

Browse Source
This commit is contained in:
Vanessa
2022-11-24 23:57:22 +08:00
parent 3a8aa2cd25
commit 8a08964a53
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/menus/protyle.ts
View File

@@ -1,6 +1,12 @@
import {hasClosestBlock, hasClosestByMatchTag} from "../protyle/util/hasClosest";
import {MenuItem} from "./Menu";
import {focusBlock, focusByRange, focusByWbr, getEditorRange, selectAll} from "../protyle/util/selection";
import {
focusBlock,
focusByRange,
focusByWbr,
getEditorRange,
selectAll,
} from "../protyle/util/selection";
import {
deleteColumn,
deleteRow,
@@ -38,6 +44,8 @@ import {pushBack} from "../mobile/util/MobileBackFoward";
import {exportAsset} from "./util";
import {removeLink} from "../protyle/toolbar/Link";
import {alignImgCenter, alignImgLeft} from "../protyle/wysiwyg/commonHotkey";
import {getEnableHTML} from "../protyle/wysiwyg/removeEmbed";
import {getContenteditableElement} from "../protyle/wysiwyg/getBlock";
export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
const nodeElement = hasClosestBlock(element);
@@ -310,11 +318,17 @@ export const contentMenu = (protyle: IProtyle, nodeElement: Element) => {
html += (item as Element).outerHTML;
}
});
if (protyle.disabled) {
html = getEnableHTML(html)
}
const tempElement = document.createElement("template");
tempElement.innerHTML = protyle.lute.BlockDOM2HTML(html);
writeText(tempElement.content.firstElementChild.innerHTML);
}
}).element);
if (protyle.disabled) {
return;
}
window.siyuan.menus.menu.append(new MenuItem({
icon: "iconCut",
accelerator: "⌘X",

7
app/src/protyle/wysiwyg/index.ts
View File

@@ -1137,11 +1137,8 @@ export class WYSIWYG {
window.siyuan.menus.menu.popup({x, y});
return false;
}
if (protyle.disabled) {
return false;
}
protyle.toolbar.range = getEditorRange(protyle.element);
if (target.tagName === "SPAN") { // https://ld246.com/article/1665141518103
if (target.tagName === "SPAN" && !protyle.disabled) { // https://ld246.com/article/1665141518103
const types = protyle.toolbar.getCurrentType(protyle.toolbar.range);
if (types.includes("block-ref")) {
refMenu(protyle, target);
@@ -1172,7 +1169,7 @@ export class WYSIWYG {
return false;
}
}
if (target.tagName === "IMG" && hasClosestByClassName(target, "img")) {
if (!protyle.disabled && target.tagName === "IMG" && hasClosestByClassName(target, "img")) {
imgMenu(protyle, protyle.toolbar.range, target.parentElement.parentElement, {
clientX: x + 4,
clientY: y