From 05c9957fd2a7e39c3c9fab4cb176e1bf8db0479e Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 8 Oct 2018 17:55:07 -0400
Subject: [PATCH] passphrase cleanup

---
 jslib                                         |  2 +-
 .../tools/password-generator.component.html   | 82 ++++++++++---------
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/jslib b/jslib
index 7b3fce17796..d5f86747bf5 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 7b3fce17796bc7b415b65b7e869e8aa081eae022
+Subproject commit d5f86747bf5533308b271b5fade75a6761f5d4e5
diff --git a/src/app/tools/password-generator.component.html b/src/app/tools/password-generator.component.html
index 28b34bdb42b..c14fcb12e37 100644
--- a/src/app/tools/password-generator.component.html
+++ b/src/app/tools/password-generator.component.html
@@ -8,56 +8,62 @@
 </div>
 <div class="form-group">
     <div class="form-check">
-        <input id="generate-password" name="generator-type" value="generate-password" class="form-check-input" type="radio" (change)="saveOptions()" [(ngModel)]="options.generateTypePassword">
+        <input id="generate-password" name="generator-type" value="0" class="form-check-input" type="radio" (change)="saveOptions()"
+            [(ngModel)]="type">
         <label for="generate-password">{{'generatePassword' | i18n}}</label>
     </div>
     <div class="form-check">
-        <input id="generate-passphrase" name="generator-type" value="generate-passphrase" class="form-check-input" type="radio" (change)="saveOptions()" [(ngModel)]="options.generateTypePassword">
+        <input id="generate-passphrase" name="generator-type" value="1" class="form-check-input" type="radio" (change)="saveOptions()"
+            [(ngModel)]="type">
         <label for="generate-passphrase">{{'generatePassphrase' | i18n}}</label>
     </div>
 </div>
-<div class="row typePassword" *ngIf="options.generateTypePassword != 'generate-passphrase'">
-    <div class="form-group col-4">
-        <label for="length">{{'length' | i18n}}</label>
-        <input id="length" class="form-control" type="number" min="5" max="128" [(ngModel)]="options.length" (blur)="saveOptions()">
-    </div>
-    <div class="form-group col-4">
-        <label for="min-number">{{'minNumbers' | i18n}}</label>
-        <input id="min-number" class="form-control" type="number" min="0" max="9" (input)="saveOptions()" [(ngModel)]="options.minNumber">
-    </div>
-    <div class="form-group col-4">
-        <label for="min-special">{{'minSpecial' | i18n}}</label>
-        <input id="min-special" class="form-control" type="number" min="0" max="9" (input)="saveOptions()" [(ngModel)]="options.minSpecial">
-    </div>
-</div>
-<div class="row typePassphrase" *ngIf="options.generateTypePassword == 'generate-passphrase'">
+<div class="row" *ngIf="type === '1'">
     <div class="form-group col-4">
         <label for="num-words">{{'numWords' | i18n}}</label>
-        <input id="num-words" class="form-control" type="number" min="3" max="128" [(ngModel)]="options.numWords" (blur)="saveOptions()">
+        <input id="num-words" class="form-control" type="number" min="3" max="20" [(ngModel)]="options.numWords" (blur)="saveOptions()">
     </div>
 </div>
-<div class="form-group typePassword" *ngIf="options.generateTypePassword != 'generate-passphrase'">
-    <div class="form-check">
-        <input id="uppercase" class="form-check-input" type="checkbox" (change)="saveOptions()" [(ngModel)]="options.uppercase">
-        <label for="uppercase" class="form-check-label">A-Z</label>
+<ng-container *ngIf="type === '0'">
+    <div class="row">
+        <div class="form-group col-4">
+            <label for="length">{{'length' | i18n}}</label>
+            <input id="length" class="form-control" type="number" min="5" max="128" [(ngModel)]="options.length" (blur)="saveOptions()">
+        </div>
+        <div class="form-group col-4">
+            <label for="min-number">{{'minNumbers' | i18n}}</label>
+            <input id="min-number" class="form-control" type="number" min="0" max="9" (input)="saveOptions()"
+                [(ngModel)]="options.minNumber">
+        </div>
+        <div class="form-group col-4">
+            <label for="min-special">{{'minSpecial' | i18n}}</label>
+            <input id="min-special" class="form-control" type="number" min="0" max="9" (input)="saveOptions()"
+                [(ngModel)]="options.minSpecial">
+        </div>
     </div>
-    <div class="form-check">
-        <input id="lowercase" class="form-check-input" type="checkbox" (change)="saveOptions()" [(ngModel)]="options.lowercase">
-        <label for="lowercase" class="form-check-label">a-z</label>
+    <div class="form-group">
+        <div class="form-check">
+            <input id="uppercase" class="form-check-input" type="checkbox" (change)="saveOptions()" [(ngModel)]="options.uppercase">
+            <label for="uppercase" class="form-check-label">A-Z</label>
+        </div>
+        <div class="form-check">
+            <input id="lowercase" class="form-check-input" type="checkbox" (change)="saveOptions()" [(ngModel)]="options.lowercase">
+            <label for="lowercase" class="form-check-label">a-z</label>
+        </div>
+        <div class="form-check">
+            <input id="numbers" class="form-check-input" type="checkbox" (change)="saveOptions()" [(ngModel)]="options.number">
+            <label for="numbers" class="form-check-label">0-9</label>
+        </div>
+        <div class="form-check">
+            <input id="special" class="form-check-input" type="checkbox" (change)="saveOptions()" [(ngModel)]="options.special">
+            <label for="special" class="form-check-label">!@#$%^&amp;*</label>
+        </div>
+        <div class="form-check">
+            <input id="ambiguous" class="form-check-input" type="checkbox" (change)="saveOptions()" [(ngModel)]="avoidAmbiguous">
+            <label for="ambiguous" class="form-check-label">{{'ambiguous' | i18n}}</label>
+        </div>
     </div>
-    <div class="form-check">
-        <input id="numbers" class="form-check-input" type="checkbox" (change)="saveOptions()" [(ngModel)]="options.number">
-        <label for="numbers" class="form-check-label">0-9</label>
-    </div>
-    <div class="form-check">
-        <input id="special" class="form-check-input" type="checkbox" (change)="saveOptions()" [(ngModel)]="options.special">
-        <label for="special" class="form-check-label">!@#$%^&amp;*</label>
-    </div>
-    <div class="form-check">
-        <input id="ambiguous" class="form-check-input" type="checkbox" (change)="saveOptions()" [(ngModel)]="avoidAmbiguous">
-        <label for="ambiguous" class="form-check-label">{{'ambiguous' | i18n}}</label>
-    </div>
-</div>
+</ng-container>
 <div class="d-flex">
     <div>
         <button type="button" class="btn btn-primary" (click)="regenerate()">