gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

added ckeditor with Find & Replace, for now without keyboard shortcut (ckeditor/ckeditor5#10645)

Browse Source
This commit is contained in:
zadam 2021-10-04 21:53:57 +02:00
parent 18ffcf7880
commit e2c4f32b5e
6 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ckeditor/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

2
libraries/ckeditor/ckeditor.js.map
View File

File diff suppressed because one or more lines are too long

30
package-lock.json generated
View File

@ -956,9 +956,9 @@
}
},
"acorn-import-assertions": {
"version": "1.7.6",
"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz",
"integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==",
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
"integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
"dev": true
},
"acorn-walk": {
@ -1891,9 +1891,9 @@
"dev": true
},
"caniuse-lite": {
"version": "1.0.30001263",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001263.tgz",
"integrity": "sha512-doiV5dft6yzWO1WwU19kt8Qz8R0/8DgEziz6/9n2FxUasteZNwNNYSmJO3GLBH8lCVE73AB1RPDPAeYbcO5Cvw==",
"version": "1.0.30001264",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001264.tgz",
"integrity": "sha512-Ftfqqfcs/ePiUmyaySsQ4PUsdcYyXG2rfoBVsk3iY1ahHaJEw65vfb7Suzqm+cEkwwPIv/XWkg27iCpRavH4zA==",
"dev": true
},
"caseless": {
@ -2882,9 +2882,9 @@
}
},
"electron": {
"version": "13.5.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.5.0.tgz",
"integrity": "sha512-s4+b1RFWkNKWp7WWrv2q60MuFljHUCbO7XAupBSCUz/NP1Hz4OenWbMPUt0H+fa8YZeN8CX3JDIA8Bet5uAJvw==",
"version": "13.5.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.5.1.tgz",
"integrity": "sha512-ZyxhIhmdaeE3xiIGObf0zqEyCyuIDqZQBv9NKX8w5FNzGm87j4qR0H1+GQg6vz+cA1Nnv1x175Zvimzc0/UwEQ==",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",
@ -2893,9 +2893,9 @@
},
"dependencies": {
"@types/node": {
"version": "14.17.19",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.19.tgz",
"integrity": "sha512-jjYI6NkyfXykucU6ELEoT64QyKOdvaA6enOqKtP4xUsGY0X0ZUZz29fUmrTRo+7v7c6TgDu82q3GHHaCEkqZwA==",
"version": "14.17.20",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.20.tgz",
"integrity": "sha512-gI5Sl30tmhXsqkNvopFydP7ASc4c2cLfGNQrVKN3X90ADFWFsPEsotm/8JHSUJQKTHbwowAHtcJPeyVhtKv0TQ==",
"dev": true
}
}
@ -8098,9 +8098,9 @@
"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
},
"webpack": {
"version": "5.56.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.56.0.tgz",
"integrity": "sha512-pJ7esw2AGkpZL0jqsEAKnDEfRZdrc9NVjAWA+d1mFkwj68ng9VQ6+Wnrl+kS5dlDHvrat5ASK5vd7wp6I7f53Q==",
"version": "5.56.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.56.1.tgz",
"integrity": "sha512-MRbTPooHJuSAfbx7Lh/qEMRUe/d0p4cRj2GPo/fq+4JUeR/+Q1EfLvS1lexslbMcJZyPXxxz/k/NzVepkA5upA==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",

4
package.json
View File

@ -81,7 +81,7 @@
},
"devDependencies": {
"cross-env": "7.0.3",
"electron": "13.5.0",
"electron": "13.5.1",
"electron-builder": "22.11.7",
"electron-packager": "15.4.0",
"electron-rebuild": "3.2.3",
@ -90,7 +90,7 @@
"jsdoc": "3.6.7",
"lorem-ipsum": "2.0.4",
"rcedit": "3.0.1",
"webpack": "5.56.0",
"webpack": "5.56.1",
"webpack-cli": "4.8.0"
},
"optionalDependencies": {

2
src/public/app/widgets/containers/ribbon_container.js
View File

@ -26,7 +26,7 @@ const TPL = `
border-bottom: 1px solid var(--main-border-color);
min-width: 24px;
flex-basis: 24px;
max-width: fit-content;
max-width: max-content;
flex-grow: 10;
}

5
src/public/app/widgets/note_context_aware_widget.js
View File

@ -1,4 +1,5 @@
import BasicWidget from "./basic_widget.js";
import appContext from "../services/app_context.js";
export default class NoteContextAwareWidget extends BasicWidget {
isNoteContext(ntxId) {
@ -10,6 +11,10 @@ export default class NoteContextAwareWidget extends BasicWidget {
}
}
isActiveNoteContext() {
return appContext.tabManager.getActiveContext() === this.noteContext;
}
isNote(noteId) {
return this.noteId === noteId;
}