Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-14 01:05:49 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into feature/improved_promoted_attributes

Browse Source 
; Conflicts:
;	src/public/app/layouts/desktop_layout.js
This commit is contained in:
Elian Doran
2024-11-27 21:29:15 +02:00
parent 0b20e8a37d 6ef55c73d4
commit bb4164f10f
103 changed files with 2611 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/public/app/widgets/ribbon_widgets/promoted_attributes.js
View File

@@ -233,6 +233,9 @@ export default class PromotedAttributesWidget extends NoteContextAwareWidget {
else if (definition.labelType === 'datetime') {
$input.prop('type', 'datetime-local')
}
else if (definition.labelType === 'time') {
$input.prop('type', 'time')
}
else if (definition.labelType === 'url') {
$input.prop("placeholder", t("promoted_attributes.url_placeholder"));