Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

load jquery from node_modules

Browse Source
This commit is contained in:
zadam
2023-11-22 20:11:41 +01:00
parent edf2dfe8f9
commit a439be79b3
8 changed files with 17 additions and 10709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10704
libraries/jquery.js vendored
View File

File diff suppressed because it is too large Load Diff

2
libraries/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
package-lock.json generated
View File

@@ -48,6 +48,7 @@
"is-svg": "4.3.2",
"jimp": "0.22.10",
"joplin-turndown-plugin-gfm": "1.0.12",
"jquery": "^3.7.1",
"jsdom": "22.1.0",
"katex": "0.16.9",
"marked": "9.1.6",
@@ -8778,6 +8779,11 @@
"resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
"integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
},
"node_modules/jquery": {
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
"integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
},
"node_modules/js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -21770,6 +21776,11 @@
"resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
"integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
},
"jquery": {
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
"integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
},
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

1
package.json
View File

@@ -74,6 +74,7 @@
"is-svg": "4.3.2",
"jimp": "0.22.10",
"joplin-turndown-plugin-gfm": "1.0.12",
"jquery": "^3.7.1",
"jsdom": "22.1.0",
"katex": "0.16.9",
"marked": "9.1.6",

2
src/routes/assets.js
View File

@@ -56,6 +56,8 @@ function register(app) {
app.use(`/${assetPath}/node_modules/boxicons/fonts/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/boxicons/fonts/')));
app.use(`/${assetPath}/node_modules/mermaid/dist/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/mermaid/dist/')));
app.use(`/${assetPath}/node_modules/jquery/dist/`, persistentCacheStatic(path.join(srcRoot, '..', 'node_modules/jquery/dist/')));
}
module.exports = {

2
src/views/desktop.ejs
View File

@@ -49,7 +49,7 @@
<!-- Required for correct loading of scripts in Electron -->
<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
<script src="<%= assetPath %>/libraries/jquery.min.js"></script>
<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>

2
src/views/mobile.ejs
View File

@@ -123,7 +123,7 @@
};
</script>
<script src="<%= assetPath %>/libraries/jquery.min.js"></script>
<script src="<%= assetPath %>/node_modules/jquery/dist/jquery.min.js"></script>
<script src="<%= assetPath %>/node_modules/dayjs/dayjs.min.js"></script>

2
src/views/setup.ejs
View File

@@ -153,7 +153,7 @@
<!-- Required for correct loading of scripts in Electron -->
<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
<script src="<%= assetPath %>/libraries/jquery.min.js"></script>
<script src="<%= assetPath %>/node_modules/jquery/dist/jquery.min.js"></script>
<script src="<%= assetPath %>/libraries/jquery.hotkeys.js"></script>
<link href="<%= assetPath %>/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">