From f238be25b502411e709855890a250186d9fac1d8 Mon Sep 17 00:00:00 2001 From: Pierre-Alexis Ciavaldini Date: Sat, 10 Feb 2018 13:23:15 +0100 Subject: [PATCH 1/2] updating yarn.lock --- yarn.lock | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1f981fc68..32429710d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -424,11 +424,11 @@ amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" -angular2-qrcode@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/angular2-qrcode/-/angular2-qrcode-2.0.1.tgz#1b4e65c302694b5078ca06f71138f7e4367754dc" +angularx-qrcode@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/angularx-qrcode/-/angularx-qrcode-1.0.1.tgz#9b10423995cd7448ef38843e241407ce7337daad" dependencies: - qrious "^2.2.0" + qrcodejs2 "0.0.2" ansi-align@^2.0.0: version "2.0.0" @@ -1360,12 +1360,6 @@ caniuse-lite@^1.0.30000791, caniuse-lite@^1.0.30000792: version "1.0.30000792" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332" -canvas@^1.6.5: - version "1.6.9" - resolved "https://registry.yarnpkg.com/canvas/-/canvas-1.6.9.tgz#e3f95cec7b16bf2d6f3fc725c02d940d3258f69b" - dependencies: - nan "^2.4.0" - capture-stack-trace@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" @@ -5813,7 +5807,7 @@ mute-stream@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" -nan@^2.3.0, nan@^2.3.2, nan@^2.4.0: +nan@^2.3.0, nan@^2.3.2: version "2.8.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" @@ -7065,11 +7059,9 @@ qjobs@^1.1.4: version "1.1.5" resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73" -qrious@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/qrious/-/qrious-2.3.0.tgz#ca7ce68a82099a67a90e4979f4b1cdf51ef32475" - optionalDependencies: - canvas "^1.6.5" +qrcodejs2@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/qrcodejs2/-/qrcodejs2-0.0.2.tgz#465afe5e39f19facecb932c11f7a186109146ae1" qs@6.5.1, qs@~6.5.1: version "6.5.1" From ec9988e6eb43ca2745f23085dac35bb7bfdafd06 Mon Sep 17 00:00:00 2001 From: Claudio Cabral Date: Sat, 10 Feb 2018 17:21:36 +0100 Subject: [PATCH 2/2] add preventDefault to avoid double pasting --- src/app/core-ui/main/main-view.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/core-ui/main/main-view.component.ts b/src/app/core-ui/main/main-view.component.ts index f342d97b9..72b3bf56b 100644 --- a/src/app/core-ui/main/main-view.component.ts +++ b/src/app/core-ui/main/main-view.component.ts @@ -153,6 +153,7 @@ export class MainViewComponent implements OnInit, OnDestroy { keyDownEvent(event: any) { if (event.metaKey && event.keyCode === 86 && navigator.platform.indexOf('Mac') > -1) { document.execCommand('Paste'); + event.preventDefault(); } }