0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🚨

Browse source
This commit is contained in:
Vanessa 2024-10-21 22:41:07 +08:00
parent b1ccdd8f88
commit 78ebd3119e
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/history/doc.ts
View file

@ -131,9 +131,9 @@ export const openDocHistory = (options: {
dialog.destroy();
} else if (type === "rollback" && !isLoading) {
getHistoryPath(target.parentElement, opElement.value, options.id, (item) => {
let dataPath = item.path;
const dataPath = item.path;
isLoading = false;
let confirmTip = window.siyuan.languages.rollbackConfirm.replace("${name}", item.title)
const confirmTip = window.siyuan.languages.rollbackConfirm.replace("${name}", item.title)
.replace("${time}", target.previousElementSibling.previousElementSibling.textContent.trim());
confirmDialog("⚠️ " + window.siyuan.languages.rollback, confirmTip, () => {
fetchPost("/api/history/rollbackDocHistory", {
@ -147,7 +147,7 @@ export const openDocHistory = (options: {
break;
} else if (target.classList.contains("b3-list-item") && !isLoading) {
getHistoryPath(target, opElement.value, options.id, (item) => {
let dataPath = item.path;
const dataPath = item.path;
fetchPost("/api/history/getDocHistoryContent", {
historyPath: dataPath,
}, (response) => {

2
app/src/history/history.ts
View file

@ -539,7 +539,7 @@ const bindEvent = (app: App, element: Element, dialog?: Dialog) => {
name = window.siyuan.languages.workspaceData;
time = target.parentElement.querySelector("span[data-type='hCreated']").textContent.trim();
}
let confirmTip = window.siyuan.languages.rollbackConfirm.replace("${name}", name)
const confirmTip = window.siyuan.languages.rollbackConfirm.replace("${name}", name)
.replace("${time}", time);
confirmDialog("⚠️ " + window.siyuan.languages.rollback, confirmTip, () => {
if (dataType === "assets") {

2
app/src/plugin/loader.ts
View file

@ -104,7 +104,7 @@ const updateDock = (dockItem: Config.IUILayoutDockTab[], index: number, plugin:
plugin.docks[tabItem.type].config.show = tabItem.show;
plugin.docks[tabItem.type].config.size = tabItem.size;
if (!window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name]) {
window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name] = {}
window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name] = {};
}
window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name][tabItem.type] = plugin.docks[tabItem.type].config;
setStorageVal(Constants.LOCAL_PLUGIN_DOCKS, window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS]);

2
app/src/protyle/util/editorCommonEvent.ts
View file

@ -781,7 +781,7 @@ const dragSame = async (protyle: IProtyle, sourceElements: Element[], targetElem
hasFoldHeading = true;
return true;
}
})
});
if (!isCopy && (sourceElements.length > 1 || hasFoldHeading) &&
sourceElements[0].parentElement.classList.contains("sb") &&
sourceElements[0].parentElement.getAttribute("data-sb-layout") === "col") {

2
app/src/protyle/wysiwyg/renderBacklink.ts
View file

@ -101,7 +101,7 @@ export const getBacklinkHeadingMore = (moreElement: HTMLElement) => {
export const genBreadcrumb = (blockPaths: IBreadcrumb[], renderFirst = false) => {
if (1 > blockPaths.length) {
return `<div contenteditable="false" style="border-top: 1px solid var(--b3-border-color);min-height: 0;width: 100%;" class="protyle-breadcrumb__bar"><span></span></div>`;
return '<div contenteditable="false" style="border-top: 1px solid var(--b3-border-color);min-height: 0;width: 100%;" class="protyle-breadcrumb__bar"><span></span></div>';
}
let html = "";