From f748bda0a984101008d1b9e661ff20485b244506 Mon Sep 17 00:00:00 2001 From: martgil <46025304+martgil@users.noreply.github.com> Date: Fri, 1 Jul 2022 16:48:43 +0800 Subject: [PATCH 1/3] add input limit on common input fields --- extension/chrome/elements/backup.htm | 2 +- extension/chrome/elements/compose.ts | 5 +++++ extension/chrome/elements/passphrase.htm | 2 +- extension/chrome/settings/modules/add_key.htm | 2 +- .../chrome/settings/modules/change_passphrase.htm | 6 +++--- extension/chrome/settings/modules/compatibility.htm | 2 +- extension/chrome/settings/modules/help.htm | 2 +- extension/chrome/settings/modules/my_key.htm | 2 +- extension/chrome/settings/modules/my_key_update.htm | 2 +- extension/chrome/settings/modules/security.htm | 2 +- .../chrome/settings/modules/test_passphrase.htm | 2 +- extension/chrome/settings/setup.htm | 12 ++++++------ 12 files changed, 23 insertions(+), 18 deletions(-) diff --git a/extension/chrome/elements/backup.htm b/extension/chrome/elements/backup.htm index 259dd6c6d56..5e7b4006abe 100644 --- a/extension/chrome/elements/backup.htm +++ b/extension/chrome/elements/backup.htm @@ -16,7 +16,7 @@
This backup is protected by your pass phrase. Please make sure to note your pass phrase down or you may lose access to your encrypted emails!
- +
Key Fingerprint:
diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts index bfefa4f6de6..09a0977282a 100644 --- a/extension/chrome/elements/compose.ts +++ b/extension/chrome/elements/compose.ts @@ -199,6 +199,11 @@ export class ComposeView extends View { this.S.cached('body').on('focusin', setActiveWindow); this.S.cached('body').on('click', setActiveWindow); this.S.cached('icon_help').click(this.setHandler(async () => await this.renderModule.openSettingsWithDialog('help'), this.errModule.handle(`help dialog`))); + this.S.cached('input_text').on('keypress',this.setHandler((el, ev) => { + if (this.S.cached('input_text').children('div').text().length >= 10) { + ev.preventDefault(); + } + })); this.attachmentsModule.setHandlers(); this.inputModule.setHandlers(); this.myPubkeyModule.setHandlers(); diff --git a/extension/chrome/elements/passphrase.htm b/extension/chrome/elements/passphrase.htm index d81c14b5765..8f2ab46c320 100644 --- a/extension/chrome/elements/passphrase.htm +++ b/extension/chrome/elements/passphrase.htm @@ -23,7 +23,7 @@

Enter FlowCrypt pass phrase to read encrypted em
- +
diff --git a/extension/chrome/settings/modules/add_key.htm b/extension/chrome/settings/modules/add_key.htm index 48e97fc1a69..82d12595fd6 100644 --- a/extension/chrome/settings/modules/add_key.htm +++ b/extension/chrome/settings/modules/add_key.htm @@ -46,7 +46,7 @@

Add Private Key

a random one.
- +
- +
diff --git a/extension/chrome/settings/setup.htm b/extension/chrome/settings/setup.htm index bb61f2a4a9f..9a7aed0a1cf 100644 --- a/extension/chrome/settings/setup.htm +++ b/extension/chrome/settings/setup.htm @@ -110,10 +110,10 @@

Set Up FlowCrypt

data-swal-page="/chrome/texts/passphrase_help.htm">choosing secure pass phrases
- +
- +
@@ -193,7 +193,7 @@

Set Up FlowCrypt

a random one.
- +
- +
- +
@@ -252,7 +252,7 @@

Set Up FlowCrypt

Found of your account key. Enter your pass phrase to continue.
- +
From 771be1f88d55572f1e0cf78a96b009d46e96f0b5 Mon Sep 17 00:00:00 2001 From: martgil <46025304+martgil@users.noreply.github.com> Date: Tue, 12 Jul 2022 14:29:34 +0800 Subject: [PATCH 2/3] add paste on the event handler (needs help) --- extension/chrome/elements/compose.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts index 09a0977282a..ba9af2b572e 100644 --- a/extension/chrome/elements/compose.ts +++ b/extension/chrome/elements/compose.ts @@ -199,8 +199,8 @@ export class ComposeView extends View { this.S.cached('body').on('focusin', setActiveWindow); this.S.cached('body').on('click', setActiveWindow); this.S.cached('icon_help').click(this.setHandler(async () => await this.renderModule.openSettingsWithDialog('help'), this.errModule.handle(`help dialog`))); - this.S.cached('input_text').on('keypress',this.setHandler((el, ev) => { - if (this.S.cached('input_text').children('div').text().length >= 10) { + this.S.cached('input_text').on('keypress paste',this.setHandler((el, ev) => { + if (this.S.cached('input_text').children('div').text().length >= 10) { // setting 10 as a limit for ease of testing; 50kB is tested to work with low spec pc; ev.preventDefault(); } })); From 3ab0e3ff99628c59a64a7f17b93cccaabd6ca83d Mon Sep 17 00:00:00 2001 From: martgil Date: Fri, 11 Nov 2022 16:28:10 +0800 Subject: [PATCH 3/3] remove event handler on message composer --- extension/chrome/elements/compose.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/extension/chrome/elements/compose.ts b/extension/chrome/elements/compose.ts index ccd2c0c582b..f18e4c6b687 100644 --- a/extension/chrome/elements/compose.ts +++ b/extension/chrome/elements/compose.ts @@ -202,11 +202,6 @@ export class ComposeView extends View { this.S.cached('body').on('focusin', setActiveWindow); this.S.cached('body').on('click', setActiveWindow); this.S.cached('icon_help').click(this.setHandler(async () => await this.renderModule.openSettingsWithDialog('help'), this.errModule.handle(`help dialog`))); - this.S.cached('input_text').on('keypress paste',this.setHandler((el, ev) => { - if (this.S.cached('input_text').children('div').text().length >= 10) { // setting 10 as a limit for ease of testing; 50kB is tested to work with low spec pc; - ev.preventDefault(); - } - })); this.attachmentsModule.setHandlers(); this.inputModule.setHandlers(); this.myPubkeyModule.setHandlers();