Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 22:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/16100

Browse source
This commit is contained in:
Vanessa 2025-10-22 09:49:21 +08:00
parent f37b8461ad
commit e775853470
2 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/protyle/toolbar/index.ts
View file

@ -1291,7 +1291,7 @@ export class Toolbar {
`<b>${match}</b>` `<b>${match}</b>`
); );
}; };
inputElement.addEventListener("input", (event) => { inputElement.addEventListener("input", (event) => {
const value = inputElement.value.trim(); const value = inputElement.value.trim();
let matchLanguages; let matchLanguages;
@ -1658,7 +1658,7 @@ ${item.name}
<button class="keyboard__action" data-action="select"><svg><use xlink:href="#iconSelect"></use></svg></button>`; <button class="keyboard__action" data-action="select"><svg><use xlink:href="#iconSelect"></use></svg></button>`;
} }
if (hasCopy || !protyle.disabled) { if (hasCopy || !protyle.disabled) {
html += "<button class=\"keyboard__action\" data-action=\"more\"><svg><use xlink:href=\"#iconMore\"></use></svg></button>"; html += '<button class="keyboard__action" data-action="more"><svg><use xlink:href="#iconMore"></use></svg></button>';
} }
this.subElement.innerHTML = `<div class="fn__flex">${html}</div>`; this.subElement.innerHTML = `<div class="fn__flex">${html}</div>`;
this.subElement.lastElementChild.addEventListener("click", async (event) => { this.subElement.lastElementChild.addEventListener("click", async (event) => {

37
app/src/protyle/util/compatibility.ts
View file

@ -126,6 +126,22 @@ export const getLocalFiles = async () => {
export const readClipboard = async () => { export const readClipboard = async () => {
const text: IClipboardData = {textPlain: "", textHTML: "", siyuanHTML: ""}; const text: IClipboardData = {textPlain: "", textHTML: "", siyuanHTML: ""};
if (isInAndroid()) {
text.textPlain = window.JSAndroid.readClipboard();
text.textHTML = window.JSAndroid.readHTMLClipboard();
const textObj = getTextSiyuanFromTextHTML(text.textHTML);
text.textHTML = textObj.textHtml;
text.siyuanHTML = textObj.textSiyuan;
return text;
}
if (isInHarmony()) {
text.textPlain = window.JSHarmony.readClipboard();
text.textHTML = window.JSHarmony.readHTMLClipboard();
const textObj = getTextSiyuanFromTextHTML(text.textHTML);
text.textHTML = textObj.textHtml;
text.siyuanHTML = textObj.textSiyuan;
return text;
}
try { try {
const clipboardContents = await navigator.clipboard.read().catch(() => { const clipboardContents = await navigator.clipboard.read().catch(() => {
alert(window.siyuan.languages.clipboardPermissionDenied); alert(window.siyuan.languages.clipboardPermissionDenied);
@ -157,19 +173,6 @@ export const readClipboard = async () => {
/// #endif /// #endif
return text; return text;
} catch (e) { } catch (e) {
if (isInAndroid()) {
text.textPlain = window.JSAndroid.readClipboard();
text.textHTML = window.JSAndroid.readHTMLClipboard();
const textObj = getTextSiyuanFromTextHTML(text.textHTML);
text.textHTML = textObj.textHtml;
text.siyuanHTML = textObj.textSiyuan;
} else if (isInHarmony()) {
text.textPlain = window.JSHarmony.readClipboard();
text.textHTML = window.JSHarmony.readHTMLClipboard();
const textObj = getTextSiyuanFromTextHTML(text.textHTML);
text.textHTML = textObj.textHtml;
text.siyuanHTML = textObj.textSiyuan;
}
return text; return text;
} }
}; };
@ -298,7 +301,7 @@ export const getScreenWidth = () => {
return window.JSHarmony.getScreenWidthPx(); return window.JSHarmony.getScreenWidthPx();
} }
return window.outerWidth; return window.outerWidth;
} };
export const isWindows = () => { export const isWindows = () => {
return navigator.platform.toUpperCase().indexOf("WIN") > -1; return navigator.platform.toUpperCase().indexOf("WIN") > -1;
@ -532,7 +535,7 @@ export const initFocusFix = () => {
const fixFocusAfterDialog = () => { const fixFocusAfterDialog = () => {
ipcRenderer.send("siyuan-focus-fix"); ipcRenderer.send("siyuan-focus-fix");
}; };
window.alert = function(message: string) { window.alert = function (message: string) {
try { try {
const result = originalAlert.call(this, message); const result = originalAlert.call(this, message);
fixFocusAfterDialog(); fixFocusAfterDialog();
@ -543,7 +546,7 @@ export const initFocusFix = () => {
return undefined; return undefined;
} }
}; };
window.confirm = function(message: string) { window.confirm = function (message: string) {
try { try {
const result = originalConfirm.call(this, message); const result = originalConfirm.call(this, message);
fixFocusAfterDialog(); fixFocusAfterDialog();
@ -555,4 +558,4 @@ export const initFocusFix = () => {
} }
}; };
}; };
/// #endif /// #endif