diff --git a/app/package.json b/app/package.json index 8edf6a5fd..951948ad7 100644 --- a/app/package.json +++ b/app/package.json @@ -49,6 +49,8 @@ } ], "devDependencies": { + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "^9.24.0", "@types/node": "^18.13.0", "@typescript-eslint/eslint-plugin": "^8.15.0", "@typescript-eslint/parser": "^8.15.0", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index d1ff9a0db..9f3569f38 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -11,7 +11,13 @@ importers: '@electron/remote': specifier: ^2.1.2 version: 2.1.2(electron@34.5.1) + '@eslint/eslintrc': + specifier: ^3.3.1 + version: 3.3.1 devDependencies: + '@eslint/js': + specifier: ^9.24.0 + version: 9.24.0 '@types/node': specifier: ^18.13.0 version: 18.13.0 @@ -308,14 +314,18 @@ packages: resolution: {integrity: sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/eslintrc@3.2.0': - resolution: {integrity: sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==} + '@eslint/eslintrc@3.3.1': + resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/js@9.15.0': resolution: {integrity: sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/js@9.24.0': + resolution: {integrity: sha512-uIY/y3z0uvOGX8cp1C2fiC4+ZmBhp6yZWkojtHL1YEMnRt1Y63HB9TM17proGEmeG7HeUY+UP36F0aknKYTpYA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/object-schema@2.1.4': resolution: {integrity: sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -2970,13 +2980,13 @@ snapshots: '@eslint/core@0.9.0': {} - '@eslint/eslintrc@3.2.0': + '@eslint/eslintrc@3.3.1': dependencies: ajv: 6.12.6 debug: 4.3.4 espree: 10.3.0 globals: 14.0.0 - ignore: 5.2.0 + ignore: 5.3.2 import-fresh: 3.3.0 js-yaml: 4.1.0 minimatch: 3.1.2 @@ -2986,6 +2996,8 @@ snapshots: '@eslint/js@9.15.0': {} + '@eslint/js@9.24.0': {} + '@eslint/object-schema@2.1.4': {} '@eslint/plugin-kit@0.2.3': @@ -4149,7 +4161,7 @@ snapshots: '@eslint-community/regexpp': 4.12.1 '@eslint/config-array': 0.19.0 '@eslint/core': 0.9.0 - '@eslint/eslintrc': 3.2.0 + '@eslint/eslintrc': 3.3.1 '@eslint/js': 9.15.0 '@eslint/plugin-kit': 0.2.3 '@humanfs/node': 0.16.6 diff --git a/app/src/boot/globalEvent/keydown.ts b/app/src/boot/globalEvent/keydown.ts index 424074025..433db09a3 100644 --- a/app/src/boot/globalEvent/keydown.ts +++ b/app/src/boot/globalEvent/keydown.ts @@ -1753,4 +1753,4 @@ export const sendUnregisterGlobalShortcut = (app:App) => { }); }); /// #endif -} +}; diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts index 553b7cc81..035dee5a9 100644 --- a/app/src/protyle/wysiwyg/index.ts +++ b/app/src/protyle/wysiwyg/index.ts @@ -2158,6 +2158,10 @@ export class WYSIWYG { }); }); hideElements(["hint", "util"], protyle); + // https://github.com/siyuan-note/siyuan/issues/14569 + if (event.target.tagName === "VIDEO") { + return; + } const ctrlIsPressed = isOnlyMeta(event); const backlinkBreadcrumbItemElement = hasClosestByClassName(event.target, "protyle-breadcrumb__item"); if (backlinkBreadcrumbItemElement) {