From 0faa987f4146c91e6c3ef9d0d975444de07f4400 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 14 Apr 2020 15:41:46 -0400 Subject: [PATCH 1/8] update lunr types (#431) --- jslib | 2 +- package-lock.json | 6 +++--- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jslib b/jslib index 72e3893f8ee..8438cafbd08 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 72e3893f8eee79f1e3678839aa194f1096c343ea +Subproject commit 8438cafbd08c1c9b1440e0c5385e15e8fb5ac524 diff --git a/package-lock.json b/package-lock.json index 8f0858d86ec..967ec597920 100644 --- a/package-lock.json +++ b/package-lock.json @@ -846,9 +846,9 @@ } }, "@types/lunr": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@types/lunr/-/lunr-2.1.6.tgz", - "integrity": "sha512-Bz6fUhX1llTa7ygQJN3ttoVkkrpW7xxSEP7D7OYFO/FCBKqKqruRUZtJzTtYA0GkQX13lxU5u+8LuCviJlAXkQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/lunr/-/lunr-2.3.3.tgz", + "integrity": "sha512-09sXZZVsB3Ib41U0fC+O1O+4UOZT1bl/e+/QubPxpqDWHNEchvx/DEb1KJMOwq6K3MTNzZFoNSzVdR++o1DVnw==", "dev": true }, "@types/node": { diff --git a/package.json b/package.json index 6baf952c7a8..b68d8cdedff 100644 --- a/package.json +++ b/package.json @@ -217,7 +217,7 @@ "devDependencies": { "@angular/compiler-cli": "^7.2.11", "@ngtools/webpack": "^7.2.2", - "@types/lunr": "^2.1.6", + "@types/lunr": "^2.3.3", "@types/node-forge": "^0.7.5", "@types/papaparse": "^4.5.3", "@types/semver": "^5.5.0", From a84af15c93a835d1fd74b16fbfb8f7999ace5dfe Mon Sep 17 00:00:00 2001 From: Elias Papavasileiou Date: Tue, 14 Apr 2020 23:11:41 +0300 Subject: [PATCH 2/8] Add minimize when copying to clipboard option (#390) * Add minimize when copying to clipboard option * Change minimizeOnCopyToClipboardKey constant reference and fix whitespace * Extend feature to context menus and view component * Cleanup and refactor methods * Refactor copy method and add minimizeOnCopyToClipboardKey constant to electronConstants.ts * Use window.main subclass and fix formatting * Revert "Use window.main subclass and fix formatting" This reverts commit 0159613751a54bc886fac0b34bd09d3a26498924. * Reimplement part of 0159613751a54bc886fac0b34bd09d3a26498924 * Add null check to VaultComponent::copyValue * Remove unused import --- src/app/accounts/settings.component.html | 10 ++++++++++ src/app/accounts/settings.component.ts | 8 ++++++++ src/app/vault/vault.component.ts | 3 +++ src/app/vault/view.component.ts | 20 +++++++++++++++++++- src/locales/en/messages.json | 6 ++++++ src/main/messaging.main.ts | 5 +++++ 6 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html index c2608bedecb..44f9a713786 100644 --- a/src/app/accounts/settings.component.html +++ b/src/app/accounts/settings.component.html @@ -59,6 +59,16 @@ {{'clearClipboardDesc' | i18n}} +
+
+ +
+ {{'minimizeOnCopyToClipboardDesc' | i18n}} +