Skip to content

Commit

Permalink
🚨
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vanessa219
Vanessa219 committed Oct 31, 2023
1 parent 98692c8 commit 22a4fd9
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 27 deletions.
12 changes: 6 additions & 6 deletions app/src/ai/actions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
</div>`,
width: isMobile() ? "92vw" : "520px",
});
const nameElement = dialog.element.querySelector("input")
const nameElement = dialog.element.querySelector("input");
const customElement = dialog.element.querySelector("textarea");
const btnsElement = dialog.element.querySelectorAll(".b3-button");
dialog.bindInput(customElement, () => {
Expand All @@ -60,8 +60,8 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
});
btnsElement[1].addEventListener("click", () => {
if (!customElement.value) {
showMessage(window.siyuan.languages["_kernel"][142])
return
showMessage(window.siyuan.languages["_kernel"][142]);
return;
}
fetchPost("/api/ai/chatGPTWithAction", {
ids,
Expand All @@ -73,8 +73,8 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
});
btnsElement[2].addEventListener("click", () => {
if (!nameElement.value && !customElement.value) {
showMessage(window.siyuan.languages["_kernel"][142])
return
showMessage(window.siyuan.languages["_kernel"][142]);
return;
}
window.siyuan.storage[Constants.LOCAL_AI].push({
name: nameElement.value,
Expand Down Expand Up @@ -149,7 +149,7 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
});
dialog.destroy();
});
nameElement.focus()
nameElement.focus();
} else {
fetchPost("/api/ai/chatGPTWithAction", {
ids,
Expand Down
4 changes: 2 additions & 2 deletions app/src/block/util.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ export const jumpToParentNext = (protyle: IProtyle, nodeElement: Element) => {
zoomOut({
protyle,
id: response.data.id,
})
});
}
})
});
}
}
};
Expand Down
1 change: 0 additions & 1 deletion app/src/boot/onGetConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import {App} from "../index";
import {initWindowEvent} from "./globalEvent/event";
import {sendGlobalShortcut} from "./globalEvent/keydown";
import {closeWindow} from "../window/closeWin";
import {loadPlugins} from "../plugin/loader";

const matchKeymap = (keymap: Record<string, IKeymapItem>, key1: "general" | "editor", key2?: "general" | "insert" | "heading" | "list" | "table") => {
if (key1 === "general") {
Expand Down
2 changes: 1 addition & 1 deletion app/src/layout/dock/Files.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ export class Files extends Model {
item.removeAttribute("style");
});
if (typeof scrollTop === "number") {
this.element.scroll({top: scrollTop, behavior: "smooth"})
this.element.scroll({top: scrollTop, behavior: "smooth"});
}
}, 120);
}, 2);
Expand Down
2 changes: 1 addition & 1 deletion app/src/mobile/menu/search.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ export const popSearch = (app: App, config = window.siyuan.storage[Constants.LOC
bindEvent(element) {
document.querySelector("#toolbarSearchNew").addEventListener("click", () => {
newFileByName(app, (document.querySelector("#toolbarSearch") as HTMLInputElement).value);
})
});
initSearchEvent(app, element.firstElementChild, config);
updateSearchResult(config, element);
}
Expand Down
10 changes: 5 additions & 5 deletions app/src/protyle/header/Background.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,18 +266,18 @@ export class Background {
event.stopPropagation();
break;
} else if (type === "show-random") {
let html = ""
let html = "";
bgs.forEach((item: string, index: number) => {
html += `<div data-index="${index}" style="height: 148px;width: 148px;${item}" class="b3-card"></div>`
})
html += `<div data-index="${index}" style="height: 148px;width: 148px;${item}" class="b3-card"></div>`;
});
const dialog = new Dialog({
title: window.siyuan.languages.random,
content: `<div class="b3-cards" style="margin-right: 0">${html}</div>`,
width: isMobile() ? "92vw" : "912px",
height: isMobile() ? "80vh" : "70vh",
});
dialog.element.addEventListener("click", (event) => {
const target = event.target as HTMLElement
const target = event.target as HTMLElement;
if (target.classList.contains("b3-card")) {
this.ial["title-img"] = bgs[parseInt(target.getAttribute("data-index"))];
this.render(this.ial, protyle.block.rootID);
Expand All @@ -287,7 +287,7 @@ export class Background {
});
dialog.destroy();
}
})
});
event.preventDefault();
event.stopPropagation();
break;
Expand Down
2 changes: 1 addition & 1 deletion app/src/protyle/hint/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ ${genHintItemHTML(item)}
searchHTML = `<button style="width: calc(100% - 16px)" class="b3-list-item b3-list-item--two" data-value="">${window.siyuan.languages.emptyContent}</button>`;
}
this.element.lastElementChild.innerHTML = searchHTML;
setPosition(this.element, parseInt(this.element.style.left), parseInt(this.element.style.right))
setPosition(this.element, parseInt(this.element.style.left), parseInt(this.element.style.right));
});
}

Expand Down
14 changes: 7 additions & 7 deletions app/src/protyle/render/av/asset.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,24 +334,24 @@ export const dragUpload = (files: string[], protyle: IProtyle, cellElement: HTML
id: protyle.block.rootID
}, (response) => {
hideMessage(msgId);
const addUpdateValue: IAVCellAssetValue[] = []
const addUpdateValue: IAVCellAssetValue[] = [];
Object.keys(response.data.succMap).forEach(key => {
const type = pathPosix().extname(key).toLowerCase();
const name = key.substring(0, key.length - type.length)
const name = key.substring(0, key.length - type.length);
if (Constants.SIYUAN_ASSETS_IMAGE.includes(type)) {
addUpdateValue.push({
type: "image",
name,
content: response.data.succMap[key],
})
});
} else {
addUpdateValue.push({
type: "file",
name,
content: response.data.succMap[key],
})
});
}
})
});
fetchPost("/api/av/renderAttributeView", {
id: avID,
}, (response) => {
Expand All @@ -362,6 +362,6 @@ export const dragUpload = (files: string[], protyle: IProtyle, cellElement: HTML
type: "addUpdate",
addUpdateValue
});
})
});
});
}
};
6 changes: 3 additions & 3 deletions app/src/protyle/util/editorCommonEvent.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
} else if (!window.siyuan.dragElement && (event.dataTransfer.types[0] === "Files" || event.dataTransfer.types.includes("text/html"))) {
// 外部文件拖入编辑器中或者编辑器内选中文字拖拽
// https://github.com/siyuan-note/siyuan/issues/9544
const avElement = hasClosestByClassName(event.target, 'av')
const avElement = hasClosestByClassName(event.target, "av");
if (!avElement) {
focusByRange(getRangeByPoint(event.clientX, event.clientY));
if (event.dataTransfer.types[0] === "Files" && !isBrowser()) {
Expand All @@ -1003,9 +1003,9 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
paste(protyle, event);
}
} else {
const cellElement = hasClosestByClassName(event.target, 'av__cell')
const cellElement = hasClosestByClassName(event.target, "av__cell");
if (cellElement) {
const cellType = avElement.querySelector(`.av__row--header [data-col-id="${cellElement.dataset.colId}"]`)?.getAttribute("data-dtype")
const cellType = avElement.querySelector(`.av__row--header [data-col-id="${cellElement.dataset.colId}"]`)?.getAttribute("data-dtype");
if (cellType === "mAsset" && event.dataTransfer.types[0] === "Files" && !isBrowser()) {
const files: string[] = [];
for (let i = 0; i < event.dataTransfer.files.length; i++) {
Expand Down

0 comments on commit 22a4fd9

Please sign in to comment.