diff --git a/src/public/app/widgets/type_widgets/content_widget.js b/src/public/app/widgets/type_widgets/content_widget.js index 43db9a365..b91db538b 100644 --- a/src/public/app/widgets/type_widgets/content_widget.js +++ b/src/public/app/widgets/type_widgets/content_widget.js @@ -91,12 +91,12 @@ const CONTENT_WIDGETS = { _optionsOther: [ SearchEngineOptions, TrayOptions, - ShareSettingsOptions, NoteErasureTimeoutOptions, AttachmentErasureTimeoutOptions, RevisionsSnapshotIntervalOptions, RevisionSnapshotsLimitOptions, - NetworkConnectionsOptions + NetworkConnectionsOptions, + ShareSettingsOptions ], _optionsAdvanced: [ DatabaseIntegrityCheckOptions, diff --git a/src/services/options_init.ts b/src/services/options_init.ts index da7318d5b..bbff8e14b 100644 --- a/src/services/options_init.ts +++ b/src/services/options_init.ts @@ -102,7 +102,6 @@ const defaultOptions: DefaultOption[] = [ { name: 'headingStyle', value: 'underline', isSynced: true }, { name: 'autoCollapseNoteTree', value: 'true', isSynced: true }, { name: 'autoReadonlySizeText', value: '10000', isSynced: false }, - { name: 'redirectBareDomain', value: 'false', isSynced: true }, { name: 'autoReadonlySizeCode', value: '30000', isSynced: false }, { name: 'dailyBackupEnabled', value: 'true', isSynced: false }, { name: 'weeklyBackupEnabled', value: 'true', isSynced: false }, @@ -138,8 +137,9 @@ const defaultOptions: DefaultOption[] = [ { name: "textNoteEditorType", value: "ckeditor-balloon", isSynced: true }, { name: "layoutOrientation", value: "vertical", isSynced: false }, - { name: 'shareRedirectUrl', value: 'share', isSynced: true }, - { name: 'loginRedirectUrl', value: 'login', isSynced: true }, + + // Share settings + { name: 'redirectBareDomain', value: 'false', isSynced: true }, { name: 'showLoginInShareTheme', value: 'false', isSynced: true } ]; diff --git a/src/share/routes.ts b/src/share/routes.ts index 896b0d781..13b27ef9c 100644 --- a/src/share/routes.ts +++ b/src/share/routes.ts @@ -158,8 +158,7 @@ function register(router: Router) { const { header, content, isEmpty } = contentRenderer.getContent(note); const subRoot = getSharedSubTreeRoot(note); const showLoginInShareTheme = optionService.getOption('showLoginInShareTheme'); - const loginRedirectUrl = optionService.getOption('loginRedirectUrl'); - const opts = { note, header, content, isEmpty, subRoot, assetPath, appPath, showLoginInShareTheme, loginRedirectUrl }; + const opts = { note, header, content, isEmpty, subRoot, assetPath, appPath, showLoginInShareTheme }; let useDefaultView = true; // Check if the user has their own template diff --git a/src/views/share/page.ejs b/src/views/share/page.ejs index 13b202f28..eb0f01f62 100644 --- a/src/views/share/page.ejs +++ b/src/views/share/page.ejs @@ -91,7 +91,7 @@