gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

template attributes don't need isInheritable flag to take effect

Browse Source
This commit is contained in:
zadam 2019-09-07 11:00:15 +02:00
parent b069436039
commit faae11f070
4 changed files with 139 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

264
package-lock.json generated
View File

@ -234,21 +234,21 @@
}
},
"@jimp/bmp": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.6.8.tgz",
"integrity": "sha512-uxVgSkI62uAzk5ZazYHEHBehow590WAkLKmDXLzkr/XP/Hv2Fx1T4DKwJ/15IY5ktq5VAhAUWGXTyd8KWFsx7w==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.7.0.tgz",
"integrity": "sha512-U5+C/tT/zGZCPcyygacgxT1T2GPF+ZRfAtgQPaULNdSSWSsDDny3eBK3zri9IjoPo+toNpNF1/3Z/AS6/x+n3Q==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"bmp-js": "^0.1.0",
"core-js": "^2.5.7"
}
},
"@jimp/core": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.6.8.tgz",
"integrity": "sha512-JOFqBBcSNiDiMZJFr6OJqC6viXj5NVBQISua0eacoYvo4YJtTajOIxC4MqWyUmGrDpRMZBR8QhSsIOwsFrdROA==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.7.0.tgz",
"integrity": "sha512-Sfd6VrtzTNf695sKNXW2haCgphdFo2C2Til8iw9fLQfrrGDwLA+JOKWjzxFtkne3eXlmoQEK8eajFAUXu7PmVw==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"any-base": "^1.1.0",
"buffer": "^5.2.0",
"core-js": "^2.5.7",
@ -269,252 +269,252 @@
}
},
"@jimp/custom": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.6.8.tgz",
"integrity": "sha512-FrYlzZRVXP2vuVwd7Nc2dlK+iZk4g6IaT1Ib8Z6vU5Kkwlt83FJIPJ2UUFABf3bF5big0wkk8ZUihWxE4Nzdng==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.7.0.tgz",
"integrity": "sha512-43WnE1Sy1d0iXFdPDzbW8Y8Ao/0HvJnAoI143lRZATDqBr7Qn/3xy2IN2YC/c0UqpLFNArepbnxizCESy4GXvw==",
"requires": {
"@jimp/core": "^0.6.8",
"@jimp/core": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/gif": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.6.8.tgz",
"integrity": "sha512-yyOlujjQcgz9zkjM5ihZDEppn9d1brJ7jQHP5rAKmqep0G7FU1D0AKcV+Ql18RhuI/CgWs10wAVcrQpmLnu4Yw==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.7.0.tgz",
"integrity": "sha512-rQB2uN64kJYdSd/FJbWjlNVDceX2tgNK4w61ay9U8BcfTDNVLRIRaSl0Ug+77uiKKOnD33zbcri0EwyKtF29aw==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7",
"omggif": "^1.0.9"
}
},
"@jimp/jpeg": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.6.8.tgz",
"integrity": "sha512-rGtXbYpFXAn471qLpTGvhbBMNHJo5KiufN+vC5AWyufntmkt5f0Ox2Cx4ijuBMDtirZchxbMLtrfGjznS4L/ew==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.7.0.tgz",
"integrity": "sha512-DxnQskbpYRI75WTy7uhBJVcsBVdTmuUvX/rP/xMDYvUdU+ZkCZ5r+yAZ4dw+WWonNKqPt/xdNcmDMW9F95Q/Xw==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7",
"jpeg-js": "^0.3.4"
}
},
"@jimp/plugin-blit": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.6.8.tgz",
"integrity": "sha512-7Tl6YpKTSpvwQbnGNhsfX2zyl3jRVVopd276Y2hF2zpDz9Bycow7NdfNU/4Nx1jaf96X6uWOtSVINcQ7rGd47w==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.7.0.tgz",
"integrity": "sha512-UemIyanhLG5BEYzgHZ1tfup6z/V/j+aJelhjS5u+ZjsxVOV75P3IKQy3mvfaUWBXTxgCzukX8+FtNo9Z8GH/1g==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-blur": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.6.8.tgz",
"integrity": "sha512-NpZCMKxXHLDQsX9zPlWtpMA660DQStY6/z8ZetyxCDbqrLe9YCXpeR4MNhdJdABIiwTm1W5FyFF4kp81PHJx3Q==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.7.0.tgz",
"integrity": "sha512-wc+vLgmcRxZfMd2ftFr+A/NBB2qziWlhPptbOaQXMGqNgb0STjOgn578/m8zPXwyRESD2VPH12YnOiGSB87Xzw==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-color": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.6.8.tgz",
"integrity": "sha512-jjFyU0zNmGOH2rjzHuOMU4kaia0oo82s/7UYfn5h7OUkmUZTd6Do3ZSK1PiXA7KR+s4B76/Omm6Doh/0SGb7BQ==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.7.0.tgz",
"integrity": "sha512-Qe4FyeVQ0rSjaMSSXq9wz10WsGHB7Nl0+uEENqnsRO5/oP3nhSotU+vZoFaMdmWTI7zCzzi8jcqwpnXHsVxSPQ==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7",
"tinycolor2": "^1.4.1"
}
},
"@jimp/plugin-contain": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.6.8.tgz",
"integrity": "sha512-p/P2wCXhAzbmEgXvGsvmxLmbz45feF6VpR4m9suPSOr8PC/i/XvTklTqYEUidYYAft4vHgsYJdS74HKSMnH8lw==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.7.0.tgz",
"integrity": "sha512-cvR61v6KzsfkHfYWHp3M1Ep0rq6wx1dNm4PeVGNhSoWcMi0KFpOqDIxUT50VbhNWeGbJJHv+lPSuFHzu8l0MJQ==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-cover": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.6.8.tgz",
"integrity": "sha512-2PvWgk+PJfRsfWDI1G8Fpjrsu0ZlpNyZxO2+fqWlVo6y/y2gP4v08FqvbkcqSjNlOu2IDWIFXpgyU0sTINWZLg==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.7.0.tgz",
"integrity": "sha512-yYzmZjitgqEgh1FfxfxrTfWNwsR2v55EiMOE1ELuBv2gnYx/K5k5gHaGwKUE1qKWChPpP+lV1+ladsBYol8bWQ==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-crop": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.6.8.tgz",
"integrity": "sha512-CbrcpWE2xxPK1n/JoTXzhRUhP4mO07mTWaSavenCg664oQl/9XCtL+A0FekuNHzIvn4myEqvkiTwN7FsbunS/Q==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.7.0.tgz",
"integrity": "sha512-eu9OPfNJXcVI3BhJeNJcNYMI+cBQFJAAaDjnhDhS+RISUEdTiwScfKb0rIIDcYnLz/PZ9joGldcFniXa/ZcqjQ==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-displace": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.6.8.tgz",
"integrity": "sha512-RmV2bPxoPE6mrPxtYSPtHxm2cGwBQr5a2p+9gH6SPy+eUMrbGjbvjwKNfXWUYD0leML+Pt5XOmAS9pIROmuruQ==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.7.0.tgz",
"integrity": "sha512-riq1AVlQoh6Ku/iaXbD7kYxzJNy7/wScvwHWpS/GizTkydcKq5wY8T7DYq9eTadxPHya8Jj7bBF7bLlBwxKW/A==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-dither": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.6.8.tgz",
"integrity": "sha512-x6V/qjxe+xypjpQm7GbiMNqci1EW5UizrcebOhHr8AHijOEqHd2hjXh5f6QIGfrkTFelc4/jzq1UyCsYntqz9Q==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.7.0.tgz",
"integrity": "sha512-YGwUnJninUboaZYBveB80gR4ksxk22aMxg8ogdghpuUAWK/KaFM2C7V/wiDLP1952r9Xa4z7kN3MhkDC7PGUdA==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-flip": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.6.8.tgz",
"integrity": "sha512-4il6Da6G39s9MyWBEee4jztEOUGJ40E6OlPjkMrdpDNvge6hYEAB31BczTYBP/CEY74j4LDSoY5LbcU4kv06yA==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.7.0.tgz",
"integrity": "sha512-61y+J5BE/U/C6vNwSZzVLugj/y4GCIFacfyBBlyL8EaStAglvvAUmZjF6b+oLyoyzLM757BaQNZAObIWtR41Ow==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-gaussian": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.6.8.tgz",
"integrity": "sha512-pVOblmjv7stZjsqloi4YzHVwAPXKGdNaHPhp4KP4vj41qtc6Hxd9z/+VWGYRTunMFac84gUToe0UKIXd6GhoKw==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.7.0.tgz",
"integrity": "sha512-MiTC1ccH94kxJ3ONC6VVpqIBR8vrg50GCn+cNB/vNOKLcNuspAABIiXgqsuA8Vx55KXNDlJ8F3mwIaM/IL2tVg==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-invert": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.6.8.tgz",
"integrity": "sha512-11zuLiXDHr6tFv4U8aieXqNXQEKbDbSBG/h+X62gGTNFpyn8EVPpncHhOqrAFtZUaPibBqMFlNJ15SzwC7ExsQ==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.7.0.tgz",
"integrity": "sha512-FTu92i6SNGvF2cFKbLa3egA2/Fq6t/OY8DVeUoS9enh4/xbqG8gWiVFyx8wVaSYLioeNeGikX2p9dmkT30FKag==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-mask": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.6.8.tgz",
"integrity": "sha512-hZJ0OiKGJyv7hDSATwJDkunB1Ie80xJnONMgpUuUseteK45YeYNBOiZVUe8vum8QI1UwavgBzcvQ9u4fcgXc9g==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.7.0.tgz",
"integrity": "sha512-lyC7PUg4B3a6SSYyGFOMLNlXHNSuRbGR86w7g7XJ76z5gdqoaJ/oxVoQ69pLT97d5ZVS2rAW5/hsa/7sQnDfLg==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-normalize": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.6.8.tgz",
"integrity": "sha512-Q4oYhU+sSyTJI7pMZlg9/mYh68ujLfOxXzQGEXuw0sHGoGQs3B0Jw7jmzGa6pIS06Hup5hD2Zuh1ppvMdjJBfQ==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.7.0.tgz",
"integrity": "sha512-2z9R+JbSmOuKtF5WfGO6AeKQI/0+/cAZKx++K1TYt1dHrEjtiW5VheVcS2AjCYwQIoNKJq6zKtY8MzfoZ5W83A==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-print": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.6.8.tgz",
"integrity": "sha512-2aokejGn4Drv1FesnZGqh5KEq0FQtR0drlmtyZrBH+r9cx7hh0Qgf4D1BOTDEgXkfSSngjGRjKKRW/fwOrVXYw==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.7.0.tgz",
"integrity": "sha512-ehVHpMSmVpzm5MUibhW/N+qaiVjmZjtOdoA+J5Ami4pbLG2gFiiQRQ/vGkXl+Yn64WPKOWT5XInMVrg7jlG48w==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7",
"load-bmfont": "^1.4.0"
}
},
"@jimp/plugin-resize": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.6.8.tgz",
"integrity": "sha512-27nPh8L1YWsxtfmV/+Ub5dOTpXyC0HMF2cu52RQSCYxr+Lm1+23dJF70AF1poUbUe+FWXphwuUxQzjBJza9UoA==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.7.0.tgz",
"integrity": "sha512-JW9x5jvI05WCCTpnNb+f1Or8xe8Tycg82srMqvVfANIwEVteszi2zTgKZkBRQ8tCA17mo/y1INYv+yHs+VyYkg==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-rotate": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.6.8.tgz",
"integrity": "sha512-GbjETvL05BDoLdszNUV4Y0yLkHf177MnqGqilA113LIvx9aD0FtUopGXYfRGVvmtTOTouoaGJUc+K6qngvKxww==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.7.0.tgz",
"integrity": "sha512-uMH2tOM+oDRfh1mb94fWngp8PlyaCSPXo1GMsOzb/ztLNdcuEes4lsEQuYmV+AYtWRNaNAYLxYcPG85snM9t1Q==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugin-scale": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.6.8.tgz",
"integrity": "sha512-GzIYWR/oCUK2jAwku23zt19V1ssaEU4pL0x2XsLNKuuJEU6DvEytJyTMXCE7OLG/MpDBQcQclJKHgiyQm5gIOQ==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.7.0.tgz",
"integrity": "sha512-aCiPbRwik0c1Eh+9rFwMPiT0Rur0kx7h+fSv3yneNbB+X2U9Ottr2teBjIyWIhYhB495GRAbA7jYR1lLi+kDWQ==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7"
}
},
"@jimp/plugins": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.6.8.tgz",
"integrity": "sha512-fMcTI72Vn/Lz6JftezTURmyP5ml/xGMe0Ljx2KRJ85IWyP33vDmGIUuutFiBEbh2+y7lRT+aTSmjs0QGa/xTmQ==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.7.0.tgz",
"integrity": "sha512-iprHiPEnERx1ptRx6jEEul5OvCucun6995lAXlcdZBDcg+f1tAobrGNZRZaEt8s9NC0PJUYRBVQ6JVjD6wrUmA==",
"requires": {
"@jimp/plugin-blit": "^0.6.8",
"@jimp/plugin-blur": "^0.6.8",
"@jimp/plugin-color": "^0.6.8",
"@jimp/plugin-contain": "^0.6.8",
"@jimp/plugin-cover": "^0.6.8",
"@jimp/plugin-crop": "^0.6.8",
"@jimp/plugin-displace": "^0.6.8",
"@jimp/plugin-dither": "^0.6.8",
"@jimp/plugin-flip": "^0.6.8",
"@jimp/plugin-gaussian": "^0.6.8",
"@jimp/plugin-invert": "^0.6.8",
"@jimp/plugin-mask": "^0.6.8",
"@jimp/plugin-normalize": "^0.6.8",
"@jimp/plugin-print": "^0.6.8",
"@jimp/plugin-resize": "^0.6.8",
"@jimp/plugin-rotate": "^0.6.8",
"@jimp/plugin-scale": "^0.6.8",
"@jimp/plugin-blit": "^0.7.0",
"@jimp/plugin-blur": "^0.7.0",
"@jimp/plugin-color": "^0.7.0",
"@jimp/plugin-contain": "^0.7.0",
"@jimp/plugin-cover": "^0.7.0",
"@jimp/plugin-crop": "^0.7.0",
"@jimp/plugin-displace": "^0.7.0",
"@jimp/plugin-dither": "^0.7.0",
"@jimp/plugin-flip": "^0.7.0",
"@jimp/plugin-gaussian": "^0.7.0",
"@jimp/plugin-invert": "^0.7.0",
"@jimp/plugin-mask": "^0.7.0",
"@jimp/plugin-normalize": "^0.7.0",
"@jimp/plugin-print": "^0.7.0",
"@jimp/plugin-resize": "^0.7.0",
"@jimp/plugin-rotate": "^0.7.0",
"@jimp/plugin-scale": "^0.7.0",
"core-js": "^2.5.7",
"timm": "^1.6.1"
}
},
"@jimp/png": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.6.8.tgz",
"integrity": "sha512-JHHg/BZ7KDtHQrcG+a7fztw45rdf7okL/YwkN4qU5FH7Fcrp41nX5QnRviDtD9hN+GaNC7kvjvcqRAxW25qjew==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.7.0.tgz",
"integrity": "sha512-SdQGFu9TnrVAPL1Gi06u6NmR0Xw8ahTCFDHDbatjpYmjqI7Ak20trUSfpE2PVax05R09ebSAxw4cIqdzIbuN3w==",
"requires": {
"@jimp/utils": "^0.6.8",
"@jimp/utils": "^0.7.0",
"core-js": "^2.5.7",
"pngjs": "^3.3.3"
}
},
"@jimp/tiff": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.6.8.tgz",
"integrity": "sha512-iWHbxd+0IKWdJyJ0HhoJCGYmtjPBOusz1z1HT/DnpePs/Lo3TO4d9ALXqYfUkyG74ZK5jULZ69KLtwuhuJz1bg==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.7.0.tgz",
"integrity": "sha512-6UkQ/IPoHzzXiEMzBLpVfrIQt6CXR0AK7mbepuSiWA6mLXZuPpEINXI6yIvQnrdQwtzDQQXkoEasbSdIplGC8g==",
"requires": {
"core-js": "^2.5.7",
"utif": "^2.0.1"
}
},
"@jimp/types": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.6.8.tgz",
"integrity": "sha512-vCZ/Cp2osy69VP21XOBACfHI5HeR60Rfd4Jidj4W73UL+HrFWOtyQiJ7hlToyu1vI5mR/NsUQpzyQvz56ADm5A==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.7.0.tgz",
"integrity": "sha512-MJL9qq3j/HZeaQkXyJ5NZn55vt05Pb9HUjSNzktjP4x6O2MGLkMsumii18eHZwOGKxPUlM5vO1eNZEcVmCNdLQ==",
"requires": {
"@jimp/bmp": "^0.6.8",
"@jimp/gif": "^0.6.8",
"@jimp/jpeg": "^0.6.8",
"@jimp/png": "^0.6.8",
"@jimp/tiff": "^0.6.8",
"@jimp/bmp": "^0.7.0",
"@jimp/gif": "^0.7.0",
"@jimp/jpeg": "^0.7.0",
"@jimp/png": "^0.7.0",
"@jimp/tiff": "^0.7.0",
"core-js": "^2.5.7",
"timm": "^1.6.1"
}
},
"@jimp/utils": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.6.8.tgz",
"integrity": "sha512-7RDfxQ2C/rarNG9iso5vmnKQbcvlQjBIlF/p7/uYj72WeZgVCB+5t1fFBKJSU4WhniHX4jUMijK+wYGE3Y3bGw==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.7.0.tgz",
"integrity": "sha512-/s1YvqrXUrIwVkmhRLbhGY5KRsWT8lDUh9oDfVABYQWblNoNrPU+U4xlRCvjkqrRVCQlo+Nh9vaP2nOFjpo7Lg==",
"requires": {
"core-js": "^2.5.7"
}
@ -7603,13 +7603,13 @@
}
},
"jimp": {
"version": "0.6.8",
"resolved": "https://registry.npmjs.org/jimp/-/jimp-0.6.8.tgz",
"integrity": "sha512-F7emeG7Hp61IM8VFbNvWENLTuHe0ghizWPuP4JS9ujx2r5mCVYEd/zdaz6M2M42ZdN41blxPajLWl9FXo7Mr2Q==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/jimp/-/jimp-0.7.0.tgz",
"integrity": "sha512-exfo/uzR6dRJVABzv9VWgSmvBQbEe6zBKiQR2Qw51mUDhAKrJmtXiyKk+JX5AxN+XRNBaq9fWmQsS+vXnCNKTA==",
"requires": {
"@jimp/custom": "^0.6.8",
"@jimp/plugins": "^0.6.8",
"@jimp/types": "^0.6.8",
"@jimp/custom": "^0.7.0",
"@jimp/plugins": "^0.7.0",
"@jimp/types": "^0.7.0",
"core-js": "^2.5.7",
"regenerator-runtime": "^0.13.3"
}

2
package.json
View File

@ -51,7 +51,7 @@
"imagemin-mozjpeg": "8.0.0",
"imagemin-pngquant": "8.0.0",
"ini": "1.3.5",
"jimp": "0.6.8",
"jimp": "0.7.0",
"mime-types": "2.1.24",
"moment": "2.24.0",
"multer": "1.4.2",

8
src/entities/note.js
View File

@ -295,16 +295,16 @@ class Note extends Entity {
treeWithAttrs(noteId, level) AS (
SELECT * FROM tree
UNION
SELECT attributes.value, treeWithAttrs.level + 1 FROM attributes
SELECT attributes.value, treeWithAttrs.level FROM attributes
JOIN treeWithAttrs ON treeWithAttrs.noteId = attributes.noteId
WHERE attributes.isDeleted = 0
AND attributes.type = 'relation'
AND attributes.name = 'template'
AND (attributes.noteId = ? OR attributes.isInheritable = 1)
AND (treeWithAttrs.level = 0 OR attributes.isInheritable = 1)
)
SELECT attributes.* FROM attributes JOIN treeWithAttrs ON attributes.noteId = treeWithAttrs.noteId
WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR attributes.noteId = ?)
ORDER BY level, noteId, position`, [this.noteId, this.noteId, this.noteId]);
WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR treeWithAttrs.level = 0)
ORDER BY level, noteId, position`, [this.noteId]);
// attributes are ordered so that "closest" attributes are first
// we order by noteId so that attributes from same note stay together. Actual noteId ordering doesn't matter.

3
src/public/javascripts/widgets/edited_notes.js
View File

@ -9,7 +9,8 @@ class EditedNotesWidget extends StandardWidget {
getMaxHeight() { return "200px"; }
async isEnabled() {
return await this.ctx.note.hasLabel("dateNote");
return await super.isEnabled()
&& await this.ctx.note.hasLabel("dateNote");
}
async doRenderBody() {