diff --git a/app/src/block/Panel.ts b/app/src/block/Panel.ts index 11f3df002..a6843e8f9 100644 --- a/app/src/block/Panel.ts +++ b/app/src/block/Panel.ts @@ -11,7 +11,6 @@ import {openNewWindowById} from "../window/openNewWindow"; /// #if !MOBILE import {moveResize} from "../dialog/moveResize"; /// #endif -import {disabledProtyle} from "../protyle/util/onGet"; import {fetchPost} from "../util/fetch"; import {showMessage} from "../dialog/message"; import {App} from "../index"; diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index a387f52f8..b3a420e21 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -3,7 +3,7 @@ import {fetchPost} from "../util/fetch"; import {isMobile} from "../util/functions"; import {Protyle} from "../protyle"; import {Constants} from "../constants"; -import {disabledProtyle, onGet} from "../protyle/util/onGet"; +import {onGet} from "../protyle/util/onGet"; import {hasClosestByAttribute, hasClosestByClassName} from "../protyle/util/hasClosest"; import {hideElements} from "../protyle/ui/hideElements"; import {needLogin, needSubscribe} from "../util/needSubscribe"; diff --git a/app/src/card/viewCards.ts b/app/src/card/viewCards.ts index 488290850..096352206 100644 --- a/app/src/card/viewCards.ts +++ b/app/src/card/viewCards.ts @@ -8,7 +8,7 @@ import {getIconByType} from "../editor/getIcon"; import {unicode2Emoji} from "../emoji"; import {addLoading} from "../protyle/ui/initUI"; import {Constants} from "../constants"; -import {disabledProtyle, onGet} from "../protyle/util/onGet"; +import {onGet} from "../protyle/util/onGet"; import {App} from "../index"; export const viewCards = (app: App, deckID: string, title: string, deckType: "Tree" | "" | "Notebook", cb?: (response: IWebSocketData) => void) => { diff --git a/app/src/config/about.ts b/app/src/config/about.ts index 9cbd6079c..f64fd981c 100644 --- a/app/src/config/about.ts +++ b/app/src/config/about.ts @@ -7,7 +7,7 @@ import {fetchPost} from "../util/fetch"; import {setAccessAuthCode, setProxy} from "./util/about"; import {exportLayout} from "../layout/util"; import {exitSiYuan, processSync} from "../dialog/processSystem"; -import {isInAndroid, isInIOS, openByMobile, writeText} from "../protyle/util/compatibility"; +import {openByMobile, writeText} from "../protyle/util/compatibility"; import {showMessage} from "../dialog/message"; import {Dialog} from "../dialog"; import {confirmDialog} from "../dialog/confirmDialog"; diff --git a/app/src/editor/index.ts b/app/src/editor/index.ts index e40a4bcf0..d5f603f92 100644 --- a/app/src/editor/index.ts +++ b/app/src/editor/index.ts @@ -1,7 +1,6 @@ import {Tab} from "../layout/Tab"; import {Protyle} from "../protyle"; import {Model} from "../layout/Model"; -import {disabledProtyle} from "../protyle/util/onGet"; import {setPadding} from "../protyle/ui/initUI"; import {getAllModels} from "../layout/getAll"; /// #if !BROWSER diff --git a/app/src/editor/util.ts b/app/src/editor/util.ts index c20f3673c..3dedfc032 100644 --- a/app/src/editor/util.ts +++ b/app/src/editor/util.ts @@ -182,7 +182,7 @@ export const openFile = (options: IOpenFileOptions) => { if (ids.includes(options.rootID) || ids.includes(options.assetPath)) { item.focus(); const optionsClone = Object.assign({}, options); - delete optionsClone.app + delete optionsClone.app; item.webContents.executeJavaScript(`window.newWindow.openFile(${JSON.stringify(optionsClone)});`); if (options.afterOpen) { options.afterOpen(); diff --git a/app/src/mobile/editor.ts b/app/src/mobile/editor.ts index e4d60f0aa..b408431dd 100644 --- a/app/src/mobile/editor.ts +++ b/app/src/mobile/editor.ts @@ -3,7 +3,7 @@ import {setEditor} from "./util/setEmpty"; import {closePanel} from "./util/closePanel"; import {Constants} from "../constants"; import {fetchPost} from "../util/fetch"; -import {disabledProtyle, onGet} from "../protyle/util/onGet"; +import {onGet} from "../protyle/util/onGet"; import {addLoading} from "../protyle/ui/initUI"; import {scrollCenter} from "../util/highlightById"; import {hasClosestByAttribute} from "../protyle/util/hasClosest"; diff --git a/app/src/mobile/util/initFramework.ts b/app/src/mobile/util/initFramework.ts index 470e49554..f44c9e6c7 100644 --- a/app/src/mobile/util/initFramework.ts +++ b/app/src/mobile/util/initFramework.ts @@ -2,7 +2,7 @@ import {Constants} from "../../constants"; import {closeModel, closePanel} from "./closePanel"; import {openMobileFileById} from "../editor"; import {validateName} from "../../editor/rename"; -import {getEventName, isIPhone} from "../../protyle/util/compatibility"; +import {getEventName} from "../../protyle/util/compatibility"; import {fetchPost} from "../../util/fetch"; import {setInlineStyle} from "../../util/assets"; import {renderSnippet} from "../../config/util/snippets"; diff --git a/app/src/protyle/wysiwyg/remove.ts b/app/src/protyle/wysiwyg/remove.ts index 72532a3d0..31778f30c 100644 --- a/app/src/protyle/wysiwyg/remove.ts +++ b/app/src/protyle/wysiwyg/remove.ts @@ -412,7 +412,7 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran transaction(protyle, doOperations, undoOperations); } // toStart 参数不能为 false, 否则 https://github.com/siyuan-note/siyuan/issues/9141 - previousLastElement = protyle.wysiwyg.element.querySelector(`[data-node-id="${previousId}"]`) + previousLastElement = protyle.wysiwyg.element.querySelector(`[data-node-id="${previousId}"]`); focusBlock(previousLastElement, undefined, getContenteditableElement(previousLastElement).textContent === "\n"); } else { focusBlock(previousLastElement, undefined, false); diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 92acfea45..4d8c1f149 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -12,7 +12,7 @@ import {reloadProtyle} from "../protyle/util/reload"; import {MenuItem} from "../menus/Menu"; import {getDisplayName, getNotebookIcon, getNotebookName, movePathTo, pathPosix} from "../util/pathName"; import {Protyle} from "../protyle"; -import {disabledProtyle, onGet} from "../protyle/util/onGet"; +import {onGet} from "../protyle/util/onGet"; import {addLoading, setPadding} from "../protyle/ui/initUI"; import {getIconByType} from "../editor/getIcon"; import {unicode2Emoji} from "../emoji";