brainwallet: don't use Alert() to signal error, it was problematic fo…

…r resetting page when changing currency
walletgeneratornet · Mar 19, 2014 · 73c1959 · 73c1959
1 parent e6dcb2d
commit 73c1959
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/index.html b/src/index.html
@@ -261,12 +261,13 @@
 						<span id="brainalgorithm" class="notes right">Algorithm: SHA256(passphrase)</span>
 					</div>
 					<div class="row extra"><span id="brainwarning"></span></div>
+          <div class="row extra"><span id="brainerror"></span></div>
 				</div>
 				<div id="brainkeyarea" class="keyarea">
 					<div class="public">
 						<div id="brainqrcodepublic" class="qrcode_public"></div>
 						<div class="pubaddress">
-							<span class="label" id="brainlabelbitcoinaddress">Bitcoin Address:</span>
+							<span class="label" id="brainlabelbitcoinaddress">Public Address:</span>
 							<span class="output" id="brainbtcaddress"></span>
 						</div>
 					</div>

diff --git a/src/ninja.brainwallet.js b/src/ninja.brainwallet.js
@@ -12,6 +12,8 @@ ninja.wallets.brainwallet = {
 	minPassphraseLength: 15,
 
 	view: function () {
+        document.getElementById("brainerror").innerHTML = "";
+
 		var key = document.getElementById("brainpassphrase").value.toString().replace(/^\s+|\s+$/g, ""); // trim white space
 		document.getElementById("brainpassphrase").value = key;
 		var keyConfirm = document.getElementById("brainpassphraseconfirm").value.toString().replace(/^\s+|\s+$/g, ""); // trim white space
@@ -33,12 +35,12 @@ ninja.wallets.brainwallet = {
 				document.getElementById("brainkeyarea").style.visibility = "visible";
 			}
 			else {
-				alert(ninja.translator.get("brainalertpassphrasetooshort") + ninja.translator.get("brainalertpassphrasewarning"));
+                document.getElementById("brainerror").innerHTML = ninja.translator.get("brainalertpassphrasetooshort");
 				ninja.wallets.brainwallet.clear();
 			}
 		}
 		else {
-			alert(ninja.translator.get("brainalertpassphrasedoesnotmatch"));
+			document.getElementById("brainerror").innerHTML = ninja.translator.get("brainalertpassphrasedoesnotmatch");
 			ninja.wallets.brainwallet.clear();
 		}
 	},