gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 13:39:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

remove fancytree and bootstrap

Browse Source
This commit is contained in:
Jin 2024-08-11 01:59:50 +02:00
parent c16c528270
commit 0967ee1b46
17 changed files with 62 additions and 13758 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/copy-dist.ts
View File

@ -80,7 +80,9 @@ const copy = async () => {
"node_modules/vanilla-js-wheel-zoom/dist/",
"node_modules/mark.js/dist/",
"node_modules/knockout/build/output/",
"node_modules/normalize.css/"
"node_modules/normalize.css/",
"node_modules/jquery.fancytree/dist/",
"node_modules/bootstrap/dist/"
];
for (const folder of nodeModulesFolder) {

7
libraries/bootstrap/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
libraries/bootstrap/css/bootstrap.min.css.map
View File

File diff suppressed because one or more lines are too long

7
libraries/bootstrap/js/bootstrap.bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
libraries/bootstrap/js/bootstrap.bundle.min.js.map
View File

File diff suppressed because one or more lines are too long

13728
libraries/fancytree/jquery.fancytree-all-deps.js
View File

File diff suppressed because it is too large Load Diff

2
libraries/fancytree/jquery.fancytree-all-deps.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
libraries/fancytree/jquery.fancytree-all-deps.min.js.map
View File

File diff suppressed because one or more lines are too long

43
package-lock.json generated
View File

@ -18,6 +18,7 @@
"autocomplete.js": "^0.38.1",
"axios": "^1.7.2",
"better-sqlite3": "^11.1.2",
"bootstrap": "^4.6.2",
"boxicons": "2.1.4",
"chokidar": "3.6.0",
"cls-hooked": "4.2.2",
@ -55,6 +56,7 @@
"joplin-turndown-plugin-gfm": "1.0.12",
"jquery": "3.7.1",
"jquery-hotkeys": "0.2.2",
"jquery.fancytree": "^2.38.3",
"jsdom": "^24.1.0",
"jsplumb": "^2.15.6",
"katex": "^0.16.11",
@ -5174,6 +5176,26 @@
"integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
"optional": true
},
"node_modules/bootstrap": {
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
"integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/twbs"
},
{
"type": "opencollective",
"url": "https://opencollective.com/bootstrap"
}
],
"license": "MIT",
"peerDependencies": {
"jquery": "1.9.1 - 3",
"popper.js": "^1.16.1"
}
},
"node_modules/boxicons": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/boxicons/-/boxicons-2.1.4.tgz",
@ -11485,6 +11507,15 @@
"resolved": "https://registry.npmjs.org/jquery-hotkeys/-/jquery-hotkeys-0.2.2.tgz",
"integrity": "sha512-1LWIp+1ZQUluPsWEJ4Ett0CRfgGsGRGU7wTlj1TBBq0hWl7fLYxl/DyARku0fz9x8lIYi6v5VXJwZx8cpJmdpQ=="
},
"node_modules/jquery.fancytree": {
"version": "2.38.3",
"resolved": "https://registry.npmjs.org/jquery.fancytree/-/jquery.fancytree-2.38.3.tgz",
"integrity": "sha512-C3CJcp4sPThy497YBXZNrDSVn/B34sv6kB+toC8gfHrPvJWgYkL3NSMovBxXo6fN6yXUnvWhWaON/ejG3Nsxdg==",
"license": "MIT",
"peerDependencies": {
"jquery": ">=1.9"
}
},
"node_modules/js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@ -14184,6 +14215,18 @@
"node": ">=12.13.0"
}
},
"node_modules/popper.js": {
"version": "1.16.1",
"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
"integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
"deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
"license": "MIT",
"peer": true,
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/popperjs"
}
},
"node_modules/postcss": {
"version": "8.4.5",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",

2
package.json
View File

@ -57,6 +57,7 @@
"autocomplete.js": "^0.38.1",
"axios": "^1.7.2",
"better-sqlite3": "^11.1.2",
"bootstrap": "^4.6.2",
"boxicons": "2.1.4",
"chokidar": "3.6.0",
"cls-hooked": "4.2.2",
@ -94,6 +95,7 @@
"joplin-turndown-plugin-gfm": "1.0.12",
"jquery": "3.7.1",
"jquery-hotkeys": "0.2.2",
"jquery.fancytree": "^2.38.3",
"jsdom": "^24.1.0",
"jsplumb": "^2.15.6",
"katex": "^0.16.11",

2
src/public/app/widgets/note_detail.js
View File

@ -273,7 +273,7 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
loadCSS: [
`${assetPath}/libraries/codemirror/codemirror.css`,
`${assetPath}/libraries/ckeditor/ckeditor-content.css`,
`${assetPath}/libraries/bootstrap/css/bootstrap.min.css`,
`${assetPath}/node_modules/bootstrap/dist/css/bootstrap.min.css`,
`${assetPath}/node_modules/katex/dist/katex.min.css`,
`${assetPath}/stylesheets/print.css`,
`${assetPath}/stylesheets/relation_map.css`,

4
src/routes/assets.ts
View File

@ -90,6 +90,10 @@ function register(app: express.Application) {
app.use(`/${assetPath}/node_modules/knockout/build/output/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/knockout/build/output/')));
app.use(`/${assetPath}/node_modules/normalize.css/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/normalize.css/')));
app.use(`/${assetPath}/node_modules/jquery.fancytree/dist/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/jquery.fancytree/dist/')));
app.use(`/${assetPath}/node_modules/bootstrap/dist/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/bootstrap/dist/')));
}
export default {

6
src/views/desktop.ejs
View File

@ -51,12 +51,12 @@
<script src="<%= assetPath %>/node_modules/jquery/dist/jquery.min.js"></script>
<link href="<%= assetPath %>/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<script src="<%= assetPath %>/libraries/bootstrap/js/bootstrap.bundle.min.js"></script>
<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<script src="<%= assetPath %>/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<!-- Include Fancytree library and skip -->
<link href="<%= assetPath %>/stylesheets/tree.css" rel="stylesheet">
<script src="<%= assetPath %>/libraries/fancytree/jquery.fancytree-all-deps.min.js"></script>
<script src="<%= assetPath %>/node_modules/jquery.fancytree/dist/jquery.fancytree-all-deps.min.js"></script>
<script src="<%= assetPath %>/node_modules/jquery-hotkeys/jquery-hotkeys.js"></script>

2
src/views/login.ejs
View File

@ -78,6 +78,6 @@
}
</script>
<link href="<%= assetPath %>/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
</body>
</html>

4
src/views/mobile.ejs
View File

@ -130,8 +130,8 @@
<link href="<%= assetPath %>/stylesheets/tree.css" rel="stylesheet">
<script src="<%= assetPath %>/libraries/fancytree/jquery.fancytree-all-deps.min.js"></script>
<link href="<%= assetPath %>/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<script src="<%= assetPath %>/libraries/bootstrap/js/bootstrap.bundle.min.js"></script>
<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<script src="<%= assetPath %>/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="<%= appPath %>/mobile.js" crossorigin type="module"></script>

2
src/views/set_password.ejs
View File

@ -46,6 +46,6 @@
if (typeof module === 'object') {window.module = module; module = undefined;}
</script>
<link href="<%= assetPath %>/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
</body>
</html>

4
src/views/setup.ejs
View File

@ -156,8 +156,8 @@
<script src="<%= assetPath %>/node_modules/jquery/dist/jquery.min.js"></script>
<script src="<%= assetPath %>/node_modules/jquery-hotkeys/jquery-hotkeys.js"></script>
<link href="<%= assetPath %>/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<script src="<%= assetPath %>/libraries/bootstrap/js/bootstrap.bundle.min.js"></script>
<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<script src="<%= assetPath %>/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="<%= assetPath %>/node_modules/knockout/build/output/knockout-latest.js"></script>