Fixed a couple of bugs

You couldn't type into the site password field when trying to provide your own password. The phishing message was wrong in two places. In one it said the existing site was undefined. In the other it reversed the order of the existing and requesting sites.
alanhkarp · Oct 24, 2023 · eed96a7 · eed96a7
1 parent 57d1d83
commit eed96a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/index.html b/index.html
@@ -335,7 +335,7 @@ <h1 id="SitePasswordWeb">Site Password</h1>
           </div>
           <div id="results">
             <div id="pwok" class="form-row">
-              <input id="sitepw" class="fixed" disabled type="text" value=""
+              <input id="sitepw" class="fixed" readonly type="text" value=""
                 placeholder="Generated site password" title="Site Password" />
                 <label for="sitepw" class="label">
                   Site password

diff --git a/src/ssp.js b/src/ssp.js
@@ -686,11 +686,12 @@ let SitePasswordWeb = ((function (self) {
         let $bkmkDomain = get("bkmkDomain");
         $bkmkDomain.onpaste = function () {
             setTimeout(() => {
-                if (parseDomain($bkmkDomain.value) === $domainname.value) {
+                let domainname = parseDomain(normalize($bkmkDomain.value));
+                if (domainname === $domainname.value) {
                     phishingWarningOff();
                 } else {
                     const settings = SitePassword.loadSettings($sitename.value);
-                    phishingWarningMsg($bkmkDomain.value);
+                    phishingWarningMsg(domainname);
                     phishingWarningOn(settings);
                 }                    
                 get("bkmkcheck").style.display = "none";
@@ -707,10 +708,6 @@ let SitePasswordWeb = ((function (self) {
         }
         function phishingWarningOn(settings) {
             httpWarningOff();
-            const domainname = $domainname.value;
-            const sitename = settings.sitename;
-            let testDomain = SitePassword.validateDomain(domainname, sitename);
-            phishingWarningMsg(testDomain);
             $phishing.style.display = "block";
             $results.style.display = "none";  // hide sitepw/remember/settings...
             $domainname.classList.add("bad-input");
@@ -743,8 +740,8 @@ let SitePasswordWeb = ((function (self) {
         function phishingWarningMsg(testDomain) {
             let sitename = normalize($sitename.value);
             get("phishingtext0").innerText = sitename;
-            get("phishingtext1").innerText = testDomain;
-            get("phishingtext2").innerText = get("domainname").value;
+            get("phishingtext1").innerText = $domainname.value;
+            get("phishingtext2").innerText = testDomain;
        }
        get("forgetbutton").onclick = function () {
         let children = get("toforgetlist").children;