1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00

Chore: Make it easier to test note publishing on desktop

This commit is contained in:
Laurent Cozic 2022-04-05 15:37:57 +01:00
parent 1a5bff3bf4
commit 27198a16a4
2 changed files with 4 additions and 1 deletions

View File

@ -820,7 +820,7 @@ export default class BaseApplication {
// Setting.setValue('sync.10.path', 'https://api.joplincloud.com');
// Setting.setValue('sync.10.userContentPath', 'https://joplinusercontent.com');
Setting.setValue('sync.10.path', 'http://api.joplincloud.local:22300');
Setting.setValue('sync.10.userContentPath', 'http://joplinusercontent.local:22300');
Setting.setValue('sync.10.userContentPath', 'http://joplincloud.local:22300');
}
// For now always disable fuzzy search due to performance issues:

View File

@ -8,6 +8,9 @@
//
// If the userContentBaseUrl is an empty string, the baseUrl is returned instead.
export default function(userId: string, baseUrl: string, userContentBaseUrl: string) {
// Special case for development, because it's difficult to get wildcard domains working locally.
if (userContentBaseUrl === 'http://joplincloud.local:22300') return 'http://joplincloud.local:22300';
if (userContentBaseUrl && baseUrl !== userContentBaseUrl) {
if (!userId) throw new Error('User ID must be specified');
const url = new URL(userContentBaseUrl);