diff --git a/app/scripts/auto-type/index.js b/app/scripts/auto-type/index.js index 4375a6f0..e5878bb2 100644 --- a/app/scripts/auto-type/index.js +++ b/app/scripts/auto-type/index.js @@ -258,7 +258,7 @@ const AutoType = { if (entries.length === 0) { if (evt.filter.useUrl) { evt.filter.useUrl = false; - if (evt.filter.title) { + if (evt.filter.title && AppSettingsModel.autoTypeTitleFilterEnabled) { evt.filter.useTitle = true; } } diff --git a/app/scripts/comp/extension/protocol-impl.js b/app/scripts/comp/extension/protocol-impl.js index 7d172edb..1f449659 100644 --- a/app/scripts/comp/extension/protocol-impl.js +++ b/app/scripts/comp/extension/protocol-impl.js @@ -325,7 +325,7 @@ async function findEntry(request, returnIfOneMatch, filterOptions) { if (!entries.length) { if (AppSettingsModel.extensionFocusIfEmpty) { filter.useUrl = false; - if (filter.title) { + if (filter.title && AppSettingsModel.autoTypeTitleFilterEnabled) { filter.useTitle = true; entries = filter.getEntries(); if (!entries.length) { diff --git a/app/scripts/const/default-app-settings.js b/app/scripts/const/default-app-settings.js index eb8f760b..63df7bb6 100644 --- a/app/scripts/const/default-app-settings.js +++ b/app/scripts/const/default-app-settings.js @@ -18,6 +18,7 @@ const DefaultAppSettings = { colorfulIcons: false, // use colorful custom icons instead of grayscale useMarkdown: true, // use Markdown in Notes field directAutotype: true, // if only one matching entry is found, select that one automatically + autoTypeTitleFilterEnabled: true, // enable the title filtering in auto-type by default titlebarStyle: 'default', // window titlebar style lockOnMinimize: true, // lock the app when it's minimized lockOnCopy: false, // lock the app after a password was copied diff --git a/app/scripts/locales/base.json b/app/scripts/locales/base.json index 9a9bba18..da4c2812 100644 --- a/app/scripts/locales/base.json +++ b/app/scripts/locales/base.json @@ -432,7 +432,8 @@ "setGenColorfulIcons": "Colorful custom icons in the list", "setGenUseMarkdown": "Markdown in notes", "setGenUseGroupIconForEntries": "Automatically use group icon for new entries", - "setGenDirectAutotype": "If only one matching entry is found, select that one automatically for Autotype", + "setGenDirectAutotype": "If only one matching entry is found, select that one automatically for auto-type", + "setGenAutoTypeTitleFilterEnabled": "Filter entries by title in auto-type", "setGenFunction": "Function", "setGenAutoSyncOnClose": "Automatically save and sync on close", "setGenAutoSyncTimer": "Automatically save and sync periodically", diff --git a/app/scripts/views/settings/settings-general-view.js b/app/scripts/views/settings/settings-general-view.js index db8d6cd7..f29bbd3f 100644 --- a/app/scripts/views/settings/settings-general-view.js +++ b/app/scripts/views/settings/settings-general-view.js @@ -53,6 +53,7 @@ class SettingsGeneralView extends View { 'change .settings__general-use-markdown': 'changeUseMarkdown', 'change .settings__general-use-group-icon-for-entries': 'changeUseGroupIconForEntries', 'change .settings__general-direct-autotype': 'changeDirectAutotype', + 'change .settings__general-autotype-title-filter': 'changeAutoTypeTitleFilter', 'change .settings__general-field-label-dblclick-autotype': 'changeFieldLabelDblClickAutoType', 'change .settings__general-device-owner-auth': 'changeDeviceOwnerAuth', @@ -135,6 +136,7 @@ class SettingsGeneralView extends View { useMarkdown: AppSettingsModel.useMarkdown, useGroupIconForEntries: AppSettingsModel.useGroupIconForEntries, directAutotype: AppSettingsModel.directAutotype, + autoTypeTitleFilterEnabled: AppSettingsModel.autoTypeTitleFilterEnabled, fieldLabelDblClickAutoType: AppSettingsModel.fieldLabelDblClickAutoType, supportsTitleBarStyles: Features.supportsTitleBarStyles, supportsCustomTitleBarAndDraggableWindow: @@ -431,6 +433,11 @@ class SettingsGeneralView extends View { AppSettingsModel.directAutotype = directAutotype; } + changeAutoTypeTitleFilter(e) { + const autoTypeTitleFilterEnabled = e.target.checked || false; + AppSettingsModel.autoTypeTitleFilterEnabled = autoTypeTitleFilterEnabled; + } + changeFieldLabelDblClickAutoType(e) { const fieldLabelDblClickAutoType = e.target.checked || false; AppSettingsModel.fieldLabelDblClickAutoType = fieldLabelDblClickAutoType; diff --git a/app/templates/settings/settings-general.hbs b/app/templates/settings/settings-general.hbs index 6a997ad5..b2895a45 100644 --- a/app/templates/settings/settings-general.hbs +++ b/app/templates/settings/settings-general.hbs @@ -169,6 +169,11 @@ id="settings__general-direct-autotype" {{#if directAutotype}}checked{{/if}} /> +
+ + +
diff --git a/release-notes.md b/release-notes.md index 9aa26998..0e0d3a23 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,6 +1,7 @@ Release notes ------------- ##### v1.18.4 (TBD) +`+` #1814: option to disable auto-type title filter by default `-` fix #1810: extension connection on old macOS (10.11) `-` fix #1813: custom icon selection `-` fix #1811: app doesn't quit during update