mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
1aff3db81f
@ -52,13 +52,13 @@ function exportToZip(taskContext, branch, format, res) {
|
||||
function getDataFileName(note, baseFileName, existingFileNames) {
|
||||
let fileName = baseFileName;
|
||||
|
||||
let existingExtension = path.extname(fileName).toLowerCase();
|
||||
let newExtension;
|
||||
|
||||
if (fileName.length > 30) {
|
||||
fileName = fileName.substr(0, 30);
|
||||
}
|
||||
|
||||
let existingExtension = path.extname(fileName).toLowerCase();
|
||||
let newExtension;
|
||||
|
||||
// following two are handled specifically since we always want to have these extensions no matter the automatic detection
|
||||
// and/or existing detected extensions in the note name
|
||||
if (note.type === 'text' && format === 'markdown') {
|
||||
|
Loading…
x
Reference in New Issue
Block a user