diff --git a/package-lock.json b/package-lock.json index 0432bf7d8..87fd68a1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10922,9 +10922,9 @@ } }, "rcedit": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-2.0.0.tgz", - "integrity": "sha512-XcFGyEBjhWSsud+R8elwQtGBbVkCf7tAiad+nXo5jc6l2rMf46NfGNwjnmBNneBIZDfq+Npf8lwP371JTONfrw==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-2.1.0.tgz", + "integrity": "sha512-Nrd/65LzMjFmKpS9d2fqIxVYdW0M8ovsN0PgZhCrPMQss2yznkp6/zjEQ1a9DzzoGv2uuN3yDJAeHybOD5ZNKA==" }, "read-all-stream": { "version": "3.1.0", diff --git a/package.json b/package.json index 2c9d330ea..cebd72f1a 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "pngjs": "3.4.0", "portscanner": "2.2.0", "rand-token": "0.4.0", - "rcedit": "2.0.0", + "rcedit": "2.1.0", "rimraf": "3.0.0", "sanitize-filename": "1.6.3", "sax": "1.2.4", diff --git a/src/public/javascripts/dialogs/options/advanced.js b/src/public/javascripts/dialogs/options/advanced.js index 1f773daa0..c1c7ba581 100644 --- a/src/public/javascripts/dialogs/options/advanced.js +++ b/src/public/javascripts/dialogs/options/advanced.js @@ -1,8 +1,35 @@ import server from "../../services/server.js"; import toastService from "../../services/toast.js"; +const TPL = ` +
This action will create a new copy of the database and anonymise it (remove all note content and leave only structure and metadata) + for sharing online for debugging purposes without fear of leaking your personal data.
+ +This will rebuild database which will typically result in smaller database file. No data will be actually changed.
+ +`; + export default class AdvancedOptions { constructor() { + $("#options-advanced").html(TPL); + this.$forceFullSyncButton = $("#force-full-sync-button"); this.$fillSyncRowsButton = $("#fill-sync-rows-button"); this.$anonymizeButton = $("#anonymize-button"); diff --git a/src/public/javascripts/dialogs/options/appearance.js b/src/public/javascripts/dialogs/options/appearance.js index d805bdf8d..8dfaf89cb 100644 --- a/src/public/javascripts/dialogs/options/appearance.js +++ b/src/public/javascripts/dialogs/options/appearance.js @@ -4,8 +4,108 @@ import cssLoader from "../../services/css_loader.js"; import zoomService from "../../services/zoom.js"; import optionsService from "../../services/options.js"; +const TPL = ` +Settings on this options tab are saved automatically after each change.
+ +`; + export default class ApperanceOptions { constructor() { + $("#options-appearance").html(TPL); + this.$themeSelect = $("#theme-select"); this.$zoomFactorSelect = $("#zoom-factor-select"); this.$oneTabDisplaySelect = $("#one-tab-display-select"); diff --git a/src/public/javascripts/dialogs/options/change_password.js b/src/public/javascripts/dialogs/options/change_password.js index a55a222bc..171893def 100644 --- a/src/public/javascripts/dialogs/options/change_password.js +++ b/src/public/javascripts/dialogs/options/change_password.js @@ -2,8 +2,30 @@ import server from "../../services/server.js"; import protectedSessionHolder from "../../services/protected_session_holder.js"; import toastService from "../../services/toast.js"; +const TPL = ` +`; + export default class ChangePasswordOptions { constructor() { + $("#options-change-password").html(TPL); + this.$form = $("#change-password-form"); this.$oldPassword = $("#old-password"); this.$newPassword1 = $("#new-password1"); diff --git a/src/public/javascripts/dialogs/options/code_notes.js b/src/public/javascripts/dialogs/options/code_notes.js index 572e2b928..4e71368d2 100644 --- a/src/public/javascripts/dialogs/options/code_notes.js +++ b/src/public/javascripts/dialogs/options/code_notes.js @@ -2,8 +2,15 @@ import server from "../../services/server.js"; import mimeTypesService from "../../services/mime_types.js"; import optionsService from "../../services/options.js"; +const TPL = ` +These options apply only for desktop builds, browsers will use their own native spell check.
+ +Changes to the spell check options will take effect after application restart.
+Protected session timeout is a time period after which the protected session is wiped out from + browser's memory. This is measured from the last interaction with protected notes. See wiki for more info.
+ +Note revision snapshot time interval is time in seconds after which new note revision will be created for the note. See wiki for more info.
+ +Sidebar width is calculated from the percent of the detail pane, if this is smaller than minimum width, then minimum width is used. If you want to have fixed width sidebar, set minimum width to the desired width and set percent to 0.
+ +This will test connection and handshake to the sync server. If sync server isn't initialized, this will set it up to sync with local document.
+ +`; + export default class SyncOptions { constructor() { + $("#options-sync-setup").html(TPL); + this.$form = $("#sync-setup-form"); this.$syncServerHost = $("#sync-server-host"); this.$syncServerTimeout = $("#sync-server-timeout"); diff --git a/src/views/dialogs/options.ejs b/src/views/dialogs/options.ejs index b551975b2..e8481a77d 100644 --- a/src/views/dialogs/options.ejs +++ b/src/views/dialogs/options.ejs @@ -34,13 +34,13 @@This action will create a new copy of the database and anonymise it (remove all note content and leave only structure and metadata) - for sharing online for debugging purposes without fear of leaking your personal data.
- -This will rebuild database which will typically result in smaller database file. No data will be actually changed.
- - -Settings on this options tab are saved automatically after each change.
- - -These options apply only for desktop builds, browsers will use their own native spell check.
- -Changes to the spell check options will take effect after application restart.
-Protected session timeout is a time period after which the protected session is wiped out from - browser's memory. This is measured from the last interaction with protected notes. See wiki for more info.
- -Note revision snapshot time interval is time in seconds after which new note revision will be created for the note. See wiki for more info.
- -This will test connection and handshake to the sync server. If sync server isn't initialized, this will set it up to sync with local document.
- - -