diff --git a/app/src/config/repos.ts b/app/src/config/repos.ts index a1d85a65b..be4a84c20 100644 --- a/app/src/config/repos.ts +++ b/app/src/config/repos.ts @@ -63,6 +63,28 @@ export const repos = {
  • ${window.siyuan.languages.cloudIntro11}
    • +`; + } + let syncModeHTML = ``; + if (isMobile()) { + syncModeHTML = `
    + ${window.siyuan.languages.syncMode} +
    + +
    ${window.siyuan.languages.syncModeTip}
    `; } return `
    @@ -86,17 +108,7 @@ export const repos = { - +${syncModeHTML}
    ${window.siyuan.languages.cloudSyncDir}
    @@ -150,7 +162,7 @@ export const repos = { loadingElement.style.height = repos.element.clientHeight + "px"; const syncConfigElement = repos.element.querySelector("#reposCloudSyncList"); bindSyncCloudListEvent(syncConfigElement); - repos.element.querySelector('[data-type="config"]').addEventListener("click", (event) => { + repos.element.querySelector('[data-type="config"]').addEventListener("click", () => { if (syncConfigElement.classList.contains("fn__none")) { getSyncCloudList(syncConfigElement); syncConfigElement.classList.remove("fn__none"); diff --git a/app/src/layout/Tab.ts b/app/src/layout/Tab.ts index 57104810c..00e9403ba 100644 --- a/app/src/layout/Tab.ts +++ b/app/src/layout/Tab.ts @@ -44,13 +44,13 @@ export class Tab { this.headElement.addEventListener("mouseenter", (event) => { event.stopPropagation(); event.preventDefault(); - let id = "" + let id = ""; if (this.model instanceof Editor && this.model.editor?.protyle?.block?.rootID) { - id = (this.model as Editor).editor.protyle.block.rootID + id = (this.model as Editor).editor.protyle.block.rootID; } else if (!this.model){ - const initData = JSON.parse(this.headElement.getAttribute("data-initdata")||"{}") + const initData = JSON.parse(this.headElement.getAttribute("data-initdata")||"{}"); if (initData) { - id = initData.blockId + id = initData.blockId; } } if (id) { diff --git a/app/src/menus/protyle.ts b/app/src/menus/protyle.ts index 3992bf816..afdda55b6 100644 --- a/app/src/menus/protyle.ts +++ b/app/src/menus/protyle.ts @@ -255,23 +255,23 @@ export const contentMenu = (protyle: IProtyle, nodeElement: Element) => { label: window.siyuan.languages.copyPlainText, click() { focusByRange(getEditorRange(nodeElement)); - writeText(range.toString()) + writeText(range.toString()); } }).element); window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.copy +" HTML", click() { focusByRange(getEditorRange(nodeElement)); - let html = '' + let html = ""; range.cloneContents().childNodes.forEach(item => { if (item.nodeType === 3) { - html += item.textContent + html += item.textContent; } else { - html += (item as Element).outerHTML + html += (item as Element).outerHTML; } - }) - const tempElement = document.createElement('template') - tempElement.innerHTML = protyle.lute.BlockDOM2HTML(html) + }); + const tempElement = document.createElement("template"); + tempElement.innerHTML = protyle.lute.BlockDOM2HTML(html); writeText(tempElement.content.firstElementChild.innerHTML); } }).element); diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts index a700ada4a..897b3d48c 100644 --- a/app/src/protyle/gutter/index.ts +++ b/app/src/protyle/gutter/index.ts @@ -503,7 +503,7 @@ export class Gutter { click() { let html = ""; selectsElement.forEach(item => { - html += item.outerHTML + html += item.outerHTML; }); writeText(protyle.lute.BlockDOM2HTML(html)); } diff --git a/app/src/protyle/toolbar/index.ts b/app/src/protyle/toolbar/index.ts index 983c18048..5484ea250 100644 --- a/app/src/protyle/toolbar/index.ts +++ b/app/src/protyle/toolbar/index.ts @@ -701,7 +701,7 @@ export class Toolbar { setPosition(this.subElement, nodeRect.right, nodeRect.bottom); } }; - const headerElement = this.subElement.querySelector(".block__icons") + const headerElement = this.subElement.querySelector(".block__icons"); headerElement.addEventListener("click", (event: MouseEvent) => { const target = event.target as HTMLElement; const btnElement = hasClosestByClassName(target, "b3-tooltips"); @@ -715,7 +715,7 @@ export class Toolbar { pingElement.classList.add("block__icon--active"); pingElement.setAttribute("aria-label", window.siyuan.languages.unpin); } - event.preventDefault() + event.preventDefault(); event.stopPropagation(); } return; @@ -866,7 +866,7 @@ export class Toolbar { renderElement.setAttribute("data-content", renderElement.getAttribute("data-content").replace(/\n/g, "")); } nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); - const newHTML = protyle.lute.SpinBlockDOM(nodeElement.outerHTML) + const newHTML = protyle.lute.SpinBlockDOM(nodeElement.outerHTML); updateTransaction(protyle, id, newHTML, html); html = newHTML; event.stopPropagation(); diff --git a/app/src/protyle/wysiwyg/remove.ts b/app/src/protyle/wysiwyg/remove.ts index f44a30eba..21291bef5 100644 --- a/app/src/protyle/wysiwyg/remove.ts +++ b/app/src/protyle/wysiwyg/remove.ts @@ -1,4 +1,4 @@ -import {focusBlock, focusSideBlock, focusByWbr} from "../util/selection"; +import {focusBlock, focusByWbr} from "../util/selection"; import { getContenteditableElement, getLastBlock, diff --git a/app/src/sync/syncGuide.ts b/app/src/sync/syncGuide.ts index 782349d48..20f4dee66 100644 --- a/app/src/sync/syncGuide.ts +++ b/app/src/sync/syncGuide.ts @@ -29,7 +29,7 @@ export const addCloudName = (cloudPanelElement: Element) => { dialog.destroy(); }); btnsElement[1].addEventListener("click", () => { - cloudPanelElement.innerHTML = '' + cloudPanelElement.innerHTML = ''; fetchPost("/api/sync/createCloudSyncDir", {name: inputElement.value}, () => { dialog.destroy(); getSyncCloudList(cloudPanelElement, true); @@ -49,7 +49,7 @@ export const bindSyncCloudListEvent = (cloudPanelElement: Element) => { break; case "removeCloud": confirmDialog(window.siyuan.languages.confirm, `${window.siyuan.languages.confirmDeleteCloudDir} ${target.parentElement.getAttribute("data-name")}`, () => { - cloudPanelElement.innerHTML = '' + cloudPanelElement.innerHTML = ''; fetchPost("/api/sync/removeCloudSyncDir", {name: target.parentElement.getAttribute("data-name")}, (response) => { window.siyuan.config.sync.cloudName = response.data; getSyncCloudList(cloudPanelElement, true); @@ -57,7 +57,7 @@ export const bindSyncCloudListEvent = (cloudPanelElement: Element) => { }); break; case "selectCloud": - cloudPanelElement.innerHTML = '' + cloudPanelElement.innerHTML = ''; fetchPost("/api/sync/setCloudSyncDir", {name: target.getAttribute("data-name")}, () => { window.siyuan.config.sync.cloudName = target.getAttribute("data-name"); getSyncCloudList(cloudPanelElement, true); @@ -82,7 +82,7 @@ export const getSyncCloudList = (cloudPanelElement: Element, reload = false) => if (response.code !== 1) { syncListHTML = '
      '; response.data.syncDirs.forEach((item: { hSize: string, cloudName: string, updated: string }) => { - syncListHTML += `
    • + syncListHTML += `
    • ${item.cloudName} @@ -118,7 +118,7 @@ export const syncGuide = (element?: Element) => { return; } fetchPost("/api/sync/performSync", {}); -} +}; const setSync = (key?: string, dialog?: Dialog) => { if (key) { @@ -130,7 +130,7 @@ const setSync = (key?: string, dialog?: Dialog) => {
    -
    ` +
    `; if (dialog) { dialog.element.querySelector(".b3-dialog__container").lastElementChild.innerHTML = listHTML; } else { @@ -140,16 +140,16 @@ const setSync = (key?: string, dialog?: Dialog) => { width: isMobile() ? "80vw" : "520px", }); } - const contentElement = dialog.element.querySelector(".b3-dialog__content") + const contentElement = dialog.element.querySelector(".b3-dialog__content"); bindSyncCloudListEvent(contentElement); getSyncCloudList(contentElement); dialog.element.querySelector(".b3-button").addEventListener("click", () => { - dialog.destroy() + dialog.destroy(); fetchPost("/api/sync/setSyncEnable", {enabled: true}, (response) => { if (response.code === 1) { showMessage(response.msg); } else { - window.siyuan.config.sync.enabled = true + window.siyuan.config.sync.enabled = true; confirmDialog(window.siyuan.languages.sync, window.siyuan.languages.syncNow, () => { fetchPost("/api/sync/performSync", {}); }); @@ -164,7 +164,7 @@ const setSync = (key?: string, dialog?: Dialog) => { fetchPost("/api/sync/performSync", {}); }); } -} +}; const setKey = () => { const dialog = new Dialog({ @@ -260,4 +260,4 @@ const setKey = () => { }); }); }); -} +}; diff --git a/app/src/util/globalShortcut.ts b/app/src/util/globalShortcut.ts index 5631ba08b..fc70ad5d7 100644 --- a/app/src/util/globalShortcut.ts +++ b/app/src/util/globalShortcut.ts @@ -33,7 +33,6 @@ import {initFileMenu, initNavigationMenu} from "../menus/navigation"; import {bindMenuKeydown} from "../menus/Menu"; import {showMessage} from "../dialog/message"; import {openHistory} from "./history"; -import {needSubscribe} from "./needSubscribe"; import {Dialog} from "../dialog"; import {unicode2Emoji} from "../emoji"; import {deleteFile} from "../editor/deleteFile"; diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts index c751a55c5..f36e99c73 100644 --- a/app/src/util/onGetConfig.ts +++ b/app/src/util/onGetConfig.ts @@ -12,8 +12,6 @@ import {fetchPost} from "./fetch"; import {mountHelp, newDailyNote} from "./mount"; import {MenuItem} from "../menus/Menu"; import {initAssets, loadAssets, setInlineStyle} from "./assets"; -import {showMessage} from "../dialog/message"; -import {needSubscribe} from "./needSubscribe"; import {goBack, goForward} from "./backForward"; import {getOpenNotebookCount} from "./pathName"; import {openFileById} from "../editor/util";