From c62193d1fe701ba831f09d150d24320da8800764 Mon Sep 17 00:00:00 2001 From: antelle Date: Thu, 17 Oct 2019 19:13:11 +0200 Subject: [PATCH] #1307: option to disable Markdown support --- app/scripts/comp/format/kdbx-to-html.js | 3 ++- app/scripts/locales/base.json | 1 + app/scripts/models/app-settings-model.js | 1 + app/scripts/views/fields/field-view-text.js | 3 ++- app/scripts/views/settings/settings-general-view.js | 8 ++++++++ app/templates/settings/settings-general.hbs | 4 ++++ release-notes.md | 1 + 7 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/scripts/comp/format/kdbx-to-html.js b/app/scripts/comp/format/kdbx-to-html.js index 6eb41b614..6e2d183e8 100644 --- a/app/scripts/comp/format/kdbx-to-html.js +++ b/app/scripts/comp/format/kdbx-to-html.js @@ -5,6 +5,7 @@ import { DateFormat } from 'util/formatting/date-format'; import { MdToHtml } from 'util/formatting/md-to-html'; import { StringFormat } from 'util/formatting/string-format'; import { Locale } from 'util/locale'; +import { AppSettingsModel } from 'models/app-settings-model'; const Templates = { db: require('templates/export/db.hbs'), @@ -43,7 +44,7 @@ function walkEntry(db, entry, parents) { let value = entryField(entry, field.name); if (value) { let html = false; - if (field.markdown) { + if (field.markdown && AppSettingsModel.useMarkdown) { const converted = MdToHtml.convert(value); if (converted !== value) { value = converted; diff --git a/app/scripts/locales/base.json b/app/scripts/locales/base.json index f87bac6f2..a1b8841ab 100644 --- a/app/scripts/locales/base.json +++ b/app/scripts/locales/base.json @@ -399,6 +399,7 @@ "setGenShowSubgroups": "Show entries from all subgroups", "setGenTableView": "Entries list table view", "setGenColorfulIcons": "Colorful custom icons in the list", + "setGenUseMarkdown": "Markdown in Notes", "setGenDirectAutotype": "If only one matching entry is found, select that one automatically for Autotype", "setGenFunction": "Function", "setGenAutoSyncOnClose": "Automatically save and sync on close", diff --git a/app/scripts/models/app-settings-model.js b/app/scripts/models/app-settings-model.js index 2a56d91df..eebf08ffb 100644 --- a/app/scripts/models/app-settings-model.js +++ b/app/scripts/models/app-settings-model.js @@ -44,6 +44,7 @@ AppSettingsModel.defineModelProperties( minimizeOnClose: false, tableView: false, colorfulIcons: false, + useMarkdown: true, directAutotype: true, titlebarStyle: 'default', lockOnMinimize: true, diff --git a/app/scripts/views/fields/field-view-text.js b/app/scripts/views/fields/field-view-text.js index 7c622bfb7..0125087fd 100644 --- a/app/scripts/views/fields/field-view-text.js +++ b/app/scripts/views/fields/field-view-text.js @@ -9,6 +9,7 @@ import { Tip } from 'util/ui/tip'; import { FieldView } from 'views/fields/field-view'; import { GeneratorView } from 'views/generator-view'; import { escape } from 'util/fn'; +import { AppSettingsModel } from 'models/app-settings-model'; class FieldViewText extends FieldView { hasOptions = true; @@ -19,7 +20,7 @@ class FieldViewText extends FieldView { } renderValue(value) { - if (this.model.markdown) { + if (this.model.markdown && AppSettingsModel.useMarkdown) { if (value && value.isProtected) { value = value.getText(); } diff --git a/app/scripts/views/settings/settings-general-view.js b/app/scripts/views/settings/settings-general-view.js index 187c33ed8..0f8cd660b 100644 --- a/app/scripts/views/settings/settings-general-view.js +++ b/app/scripts/views/settings/settings-general-view.js @@ -40,6 +40,7 @@ class SettingsGeneralView extends View { 'change .settings__general-lock-on-os-lock': 'changeLockOnOsLock', 'change .settings__general-table-view': 'changeTableView', 'change .settings__general-colorful-icons': 'changeColorfulIcons', + 'change .settings__general-use-markdown': 'changeUseMarkdown', 'change .settings__general-direct-autotype': 'changeDirectAutotype', 'change .settings__general-titlebar-style': 'changeTitlebarStyle', 'click .settings__general-update-btn': 'checkUpdate', @@ -104,6 +105,7 @@ class SettingsGeneralView extends View { updateManual, releaseNotesLink: Links.ReleaseNotes, colorfulIcons: AppSettingsModel.colorfulIcons, + useMarkdown: AppSettingsModel.useMarkdown, directAutotype: AppSettingsModel.directAutotype, supportsTitleBarStyles: Launcher && Features.supportsTitleBarStyles(), titlebarStyle: AppSettingsModel.titlebarStyle, @@ -297,6 +299,12 @@ class SettingsGeneralView extends View { Events.emit('refresh'); } + changeUseMarkdown(e) { + const useMarkdown = e.target.checked || false; + AppSettingsModel.useMarkdown = useMarkdown; + Events.emit('refresh'); + } + changeDirectAutotype(e) { const directAutotype = e.target.checked || false; AppSettingsModel.directAutotype = directAutotype; diff --git a/app/templates/settings/settings-general.hbs b/app/templates/settings/settings-general.hbs index 3e5782152..83507cc2c 100644 --- a/app/templates/settings/settings-general.hbs +++ b/app/templates/settings/settings-general.hbs @@ -88,6 +88,10 @@ +
+ + +

{{res 'setGenFunction'}}

{{#if canAutoSaveOnClose}} diff --git a/release-notes.md b/release-notes.md index 67c4ac779..51ce77c21 100644 --- a/release-notes.md +++ b/release-notes.md @@ -7,6 +7,7 @@ Release notes `+` #565: global shortcut to open KeeWeb `+` #862: downloading attachments on mobile `+` #480: option to launch the app minimized +`+` #1307: option to disable Markdown support `-` fix #1273: untranslated menu items `-` fix #1311: better monospace fonts