From 902d2f723dc9781cdd62883fa190f55416a0a0cc Mon Sep 17 00:00:00 2001
From: pointbiz <dizzle@pointbiz.com>
Date: Fri, 25 Oct 2013 21:36:17 -0400
Subject: [PATCH] v2.5.2 change defaults for paper wallet 'addresses to
 generate'

---
 bitaddress.org.html      | 16 ++++++----------
 src/bitaddress-ui.html   |  2 +-
 src/ninja.paperwallet.js | 14 +++++---------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/bitaddress.org.html b/bitaddress.org.html
index 6f60d65..75ff920 100644
--- a/bitaddress.org.html
+++ b/bitaddress.org.html
@@ -6129,7 +6129,7 @@ body { font-family: Arial; }
 			</div>
 			<div class="authorpgp">
 				<span class="item">
-					<a href="pgpsignedmsg.txt" target="_blank"><span id="footerlabelversion">Version History</span> (v2.5.1)</a>
+					<a href="pgpsignedmsg.txt" target="_blank"><span id="footerlabelversion">Version History</span> (v2.5.2)</a>
 					(<a href="ninja_bitaddress.org.txt" target="_blank" id="footerlabelpgp">PGP</a>)
 				</span>
 				<span class="item">527B 5C82 B1F6 B2DB 72A0<br />ECBF 8749 7B91 6397 4F5A</span>
@@ -7398,16 +7398,12 @@ ninja.wallets.paperwallet = {
 		var limitperpage;
 
 		document.getElementById("paperkeyarea").style.fontSize = "100%";
-		if (!hideArt.checked && paperEncrypt.checked) {
-			limit = 1;
-			limitperpage = ninja.wallets.paperwallet.pageBreakAtArtisticDefault;			
-		}
-		else if (!hideArt.checked && !paperEncrypt.checked) {
+		if (!hideArt.checked) {
 			limit = ninja.wallets.paperwallet.pageBreakAtArtisticDefault;
-			limitperpage = ninja.wallets.paperwallet.pageBreakAtArtisticDefault;
-		}
-		else if (hideArt.checked && paperEncrypt.checked) {
-			limit = 1;
+			limitperpage = ninja.wallets.paperwallet.pageBreakAtArtisticDefault;
+		}
+		else if (hideArt.checked && paperEncrypt.checked) {
+			limit = ninja.wallets.paperwallet.pageBreakAtDefault;
 			limitperpage = ninja.wallets.paperwallet.pageBreakAtDefault;
 			// reduce font size
 			document.getElementById("paperkeyarea").style.fontSize = "95%";
diff --git a/src/bitaddress-ui.html b/src/bitaddress-ui.html
index b8925e7..5e1ddf7 100644
--- a/src/bitaddress-ui.html
+++ b/src/bitaddress-ui.html
@@ -389,7 +389,7 @@
 			</div>
 			<div class="authorpgp">
 				<span class="item">
-					<a href="pgpsignedmsg.txt" target="_blank"><span id="footerlabelversion">Version History</span> (v2.5.1)</a>
+					<a href="pgpsignedmsg.txt" target="_blank"><span id="footerlabelversion">Version History</span> (v2.5.2)</a>
 					(<a href="ninja_bitaddress.org.txt" target="_blank" id="footerlabelpgp">PGP</a>)
 				</span>
 				<span class="item">527B 5C82 B1F6 B2DB 72A0<br />ECBF 8749 7B91 6397 4F5A</span>
diff --git a/src/ninja.paperwallet.js b/src/ninja.paperwallet.js
index cf4c69b..86a50a1 100644
--- a/src/ninja.paperwallet.js
+++ b/src/ninja.paperwallet.js
@@ -220,16 +220,12 @@ ninja.wallets.paperwallet = {
 		var limitperpage;
 
 		document.getElementById("paperkeyarea").style.fontSize = "100%";
-		if (!hideArt.checked && paperEncrypt.checked) {
-			limit = 1;
-			limitperpage = ninja.wallets.paperwallet.pageBreakAtArtisticDefault;			
-		}
-		else if (!hideArt.checked && !paperEncrypt.checked) {
+		if (!hideArt.checked) {
 			limit = ninja.wallets.paperwallet.pageBreakAtArtisticDefault;
-			limitperpage = ninja.wallets.paperwallet.pageBreakAtArtisticDefault;
-		}
-		else if (hideArt.checked && paperEncrypt.checked) {
-			limit = 1;
+			limitperpage = ninja.wallets.paperwallet.pageBreakAtArtisticDefault;
+		}
+		else if (hideArt.checked && paperEncrypt.checked) {
+			limit = ninja.wallets.paperwallet.pageBreakAtDefault;
 			limitperpage = ninja.wallets.paperwallet.pageBreakAtDefault;
 			// reduce font size
 			document.getElementById("paperkeyarea").style.fontSize = "95%";