From 1089c06d7774c15183278043eaca17d0fedbc146 Mon Sep 17 00:00:00 2001
From: Liu Junqi <i@ljq.zone>
Date: Thu, 21 Oct 2021 14:19:30 +0800
Subject: [PATCH 1/4] fix issue #1933

---
 src/popup/generator/password-generator.component.html | 4 ++--
 src/popup/generator/password-generator.component.ts   | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/popup/generator/password-generator.component.html b/src/popup/generator/password-generator.component.html
index 6986210e94..f5a3602738 100644
--- a/src/popup/generator/password-generator.component.html
+++ b/src/popup/generator/password-generator.component.html
@@ -54,7 +54,7 @@
         <div class="box-content">
             <div class="box-content-row box-content-row-input" appBoxRow>
                 <label for="num-words">{{'numWords' | i18n}}</label>
-                <input id="num-words" type="number" min="3" max="20" (blur)="saveOptions()"
+                <input id="num-words" type="number" min="3" max="20" (change)="lengthInput()"
                     [(ngModel)]="options.numWords">
             </div>
             <div class="box-content-row box-content-row-input" appBoxRow>
@@ -80,7 +80,7 @@
                 <div class="box-content-row box-content-row-slider" appBoxRow>
                     <label for="length">{{'length' | i18n}}</label>
                     <input id="length" type="number" min="5" max="128" [(ngModel)]="options.length"
-                        (change)="lengthChanged()" (blur)="saveOptions()">
+                        (change)="lengthInput()">
                     <input id="lengthRange" type="range" min="5" max="128" step="1" [(ngModel)]="options.length"
                         (change)="sliderChanged()" (input)="sliderInput()">
                 </div>
diff --git a/src/popup/generator/password-generator.component.ts b/src/popup/generator/password-generator.component.ts
index 6fffda8b41..48ef21852c 100644
--- a/src/popup/generator/password-generator.component.ts
+++ b/src/popup/generator/password-generator.component.ts
@@ -40,8 +40,11 @@ export class PasswordGeneratorComponent extends BasePasswordGeneratorComponent {
         this.close();
     }
 
-    lengthChanged() {
-        document.getElementById('length').focus();
+    async lengthInput() {
+        var last = this.password;
+        this.saveOptions();
+        if(last != this.password)
+            await this.passwordGenerationService.addHistory(this.password);
     }
 
     close() {

From 80d4739757ced32a0fe704f4ec6cd57e23229441 Mon Sep 17 00:00:00 2001
From: Liu Junqi <i@ljq.zone>
Date: Fri, 22 Oct 2021 10:11:01 +0800
Subject: [PATCH 2/4] fix issue #1933

---
 src/popup/generator/password-generator.component.html | 4 ++--
 src/popup/generator/password-generator.component.ts   | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/popup/generator/password-generator.component.html b/src/popup/generator/password-generator.component.html
index 6986210e94..800580c2b2 100644
--- a/src/popup/generator/password-generator.component.html
+++ b/src/popup/generator/password-generator.component.html
@@ -54,7 +54,7 @@
         <div class="box-content">
             <div class="box-content-row box-content-row-input" appBoxRow>
                 <label for="num-words">{{'numWords' | i18n}}</label>
-                <input id="num-words" type="number" min="3" max="20" (blur)="saveOptions()"
+                <input id="num-words" type="number" min="3" max="20" (change)="saveOptions()"
                     [(ngModel)]="options.numWords">
             </div>
             <div class="box-content-row box-content-row-input" appBoxRow>
@@ -80,7 +80,7 @@
                 <div class="box-content-row box-content-row-slider" appBoxRow>
                     <label for="length">{{'length' | i18n}}</label>
                     <input id="length" type="number" min="5" max="128" [(ngModel)]="options.length"
-                        (change)="lengthChanged()" (blur)="saveOptions()">
+                        (change)="saveOptions()">
                     <input id="lengthRange" type="range" min="5" max="128" step="1" [(ngModel)]="options.length"
                         (change)="sliderChanged()" (input)="sliderInput()">
                 </div>
diff --git a/src/popup/generator/password-generator.component.ts b/src/popup/generator/password-generator.component.ts
index 6fffda8b41..d2007d33eb 100644
--- a/src/popup/generator/password-generator.component.ts
+++ b/src/popup/generator/password-generator.component.ts
@@ -40,10 +40,6 @@ export class PasswordGeneratorComponent extends BasePasswordGeneratorComponent {
         this.close();
     }
 
-    lengthChanged() {
-        document.getElementById('length').focus();
-    }
-
     close() {
         this.location.back();
     }

From a5fac5939aef554a29dd7ecb756aec2e36d17ab4 Mon Sep 17 00:00:00 2001
From: Liu Junqi <i@ljq.zone>
Date: Fri, 22 Oct 2021 10:22:46 +0800
Subject: [PATCH 3/4] merged jslib change

---
 jslib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jslib b/jslib
index a20e935268..24fe836032 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit a20e935268c986538ff68f72016bb8c772ea3a1b
+Subproject commit 24fe836032354d4ec39435776e54dd0995e1b389

From d48fb927eba9012b9926f2891dce92db9da7780c Mon Sep 17 00:00:00 2001
From: Liu Junqi <i@ljq.zone>
Date: Fri, 22 Oct 2021 11:40:51 +0800
Subject: [PATCH 4/4] also modified the minNumbers&minSpecial field

---
 src/popup/generator/password-generator.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/popup/generator/password-generator.component.html b/src/popup/generator/password-generator.component.html
index 800580c2b2..b1fad03466 100644
--- a/src/popup/generator/password-generator.component.html
+++ b/src/popup/generator/password-generator.component.html
@@ -110,12 +110,12 @@
             <div class="box-content">
                 <div class="box-content-row box-content-row-input" appBoxRow>
                     <label for="min-number">{{'minNumbers' | i18n}}</label>
-                    <input id="min-number" type="number" min="0" max="9" (blur)="saveOptions()"
+                    <input id="min-number" type="number" min="0" max="9" (change)="saveOptions()"
                         [(ngModel)]="options.minNumber">
                 </div>
                 <div class="box-content-row box-content-row-input" appBoxRow>
                     <label for="min-special">{{'minSpecial' | i18n}}</label>
-                    <input id="min-special" type="number" min="0" max="9" (blur)="saveOptions()"
+                    <input id="min-special" type="number" min="0" max="9" (change)="saveOptions()"
                         [(ngModel)]="options.minSpecial">
                 </div>
                 <div class="box-content-row box-content-row-checkbox" appBoxRow>