diff --git a/.eslintrc.js b/.eslintrc.js index 96d54b5a5..a0db0c5e0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -69,6 +69,7 @@ module.exports = { "prefer-template": ["error"], "template-curly-spacing": ["error", "never"], "object-curly-spacing": ["error", "always"], + "array-bracket-spacing": ["error", "never"], "key-spacing": ["error", { "beforeColon": false, "afterColon": true, diff --git a/CliClient/tests/models_Note.js b/CliClient/tests/models_Note.js index 535f3e21d..560ed2da2 100644 --- a/CliClient/tests/models_Note.js +++ b/CliClient/tests/models_Note.js @@ -92,11 +92,11 @@ describe('models_Note', function() { it('should serialize and unserialize without modifying data', asyncTest(async () => { let folder1 = await Folder.save({ title: 'folder1' }); const testCases = [ - [ { title: '', body: 'Body and no title\nSecond line\nThird Line', parent_id: folder1.id }, + [{ title: '', body: 'Body and no title\nSecond line\nThird Line', parent_id: folder1.id }, '', 'Body and no title\nSecond line\nThird Line'], - [ { title: 'Note title', body: 'Body and title', parent_id: folder1.id }, + [{ title: 'Note title', body: 'Body and title', parent_id: folder1.id }, 'Note title', 'Body and title'], - [ { title: 'Title and no body', body: '', parent_id: folder1.id }, + [{ title: 'Title and no body', body: '', parent_id: folder1.id }, 'Title and no body', ''], ]; diff --git a/Tools/build-website.js b/Tools/build-website.js index 5f8e92149..cf91adbd8 100644 --- a/Tools/build-website.js +++ b/Tools/build-website.js @@ -566,25 +566,25 @@ async function main() { renderMdToHtml(makeHomePageMd(), `${rootDir}/docs/index.html`, { sourceMarkdownFile: 'README.md' }); const sources = [ - [ 'readme/changelog.md', 'docs/changelog/index.html', { title: 'Changelog (Desktop App)' } ], - [ 'readme/changelog_cli.md', 'docs/changelog_cli/index.html', { title: 'Changelog (CLI App)' } ], - [ 'readme/clipper.md', 'docs/clipper/index.html', { title: 'Web Clipper' } ], - [ 'readme/debugging.md', 'docs/debugging/index.html', { title: 'Debugging' } ], - [ 'readme/desktop.md', 'docs/desktop/index.html', { title: 'Desktop Application' } ], - [ 'readme/donate.md', 'docs/donate/index.html', { title: 'Donate' } ], - [ 'readme/e2ee.md', 'docs/e2ee/index.html', { title: 'End-To-End Encryption' } ], - [ 'readme/faq.md', 'docs/faq/index.html', { title: 'FAQ' } ], - [ 'readme/mobile.md', 'docs/mobile/index.html', { title: 'Mobile Application' } ], - [ 'readme/spec.md', 'docs/spec/index.html', { title: 'Specifications' } ], - [ 'readme/stats.md', 'docs/stats/index.html', { title: 'Statistics' } ], - [ 'readme/terminal.md', 'docs/terminal/index.html', { title: 'Terminal Application' } ], - [ 'readme/api.md', 'docs/api/index.html', { title: 'REST API' } ], - [ 'readme/prereleases.md', 'docs/prereleases/index.html', { title: 'Pre-releases' } ], - [ 'readme/markdown.md', 'docs/markdown/index.html', { title: 'Markdown Guide' } ], - [ 'readme/nextcloud_app.md', 'docs/nextcloud_app/index.html', { title: 'Joplin Web API for Nextcloud' } ], + ['readme/changelog.md', 'docs/changelog/index.html', { title: 'Changelog (Desktop App)' }], + ['readme/changelog_cli.md', 'docs/changelog_cli/index.html', { title: 'Changelog (CLI App)' }], + ['readme/clipper.md', 'docs/clipper/index.html', { title: 'Web Clipper' }], + ['readme/debugging.md', 'docs/debugging/index.html', { title: 'Debugging' }], + ['readme/desktop.md', 'docs/desktop/index.html', { title: 'Desktop Application' }], + ['readme/donate.md', 'docs/donate/index.html', { title: 'Donate' }], + ['readme/e2ee.md', 'docs/e2ee/index.html', { title: 'End-To-End Encryption' }], + ['readme/faq.md', 'docs/faq/index.html', { title: 'FAQ' }], + ['readme/mobile.md', 'docs/mobile/index.html', { title: 'Mobile Application' }], + ['readme/spec.md', 'docs/spec/index.html', { title: 'Specifications' }], + ['readme/stats.md', 'docs/stats/index.html', { title: 'Statistics' }], + ['readme/terminal.md', 'docs/terminal/index.html', { title: 'Terminal Application' }], + ['readme/api.md', 'docs/api/index.html', { title: 'REST API' }], + ['readme/prereleases.md', 'docs/prereleases/index.html', { title: 'Pre-releases' }], + ['readme/markdown.md', 'docs/markdown/index.html', { title: 'Markdown Guide' }], + ['readme/nextcloud_app.md', 'docs/nextcloud_app/index.html', { title: 'Joplin Web API for Nextcloud' }], - [ 'readme/gsoc2020/index.md', 'docs/gsoc2020/index.html', { title: 'Google Summer of Code' } ], - [ 'readme/gsoc2020/ideas.md', 'docs/gsoc2020/ideas.html', { title: 'GSoC: Project Ideas' } ], + ['readme/gsoc2020/index.md', 'docs/gsoc2020/index.html', { title: 'Google Summer of Code' }], + ['readme/gsoc2020/ideas.md', 'docs/gsoc2020/ideas.html', { title: 'GSoC: Project Ideas' }], ]; const path = require('path');