zervo/bitaddress.org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge a7ca7dd0cf into 72aefc03e0

Browse source
This commit is contained in:
Paweł Płóciennik 2017-10-23 19:16:44 +00:00 • committed by GitHub
commit 49297cf41c
4 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bitaddress.org.html
View file

@ -6370,6 +6370,7 @@ hr { margin: 20px 0; border-top: 2px dashed #008000; }
.keyarea .pubaddress { display: inline-block; height: 40px; padding: 0 0 0 10px; float: left; } .keyarea .pubaddress { display: inline-block; height: 40px; padding: 0 0 0 10px; float: left; }
.keyarea .privwif { margin: 0; float: right; text-align: right; padding: 0 20px 0 0; position: relative; } .keyarea .privwif { margin: 0; float: right; text-align: right; padding: 0 20px 0 0; position: relative; }
.keyarea .label { font-weight: bold; } .keyarea .label { font-weight: bold; }
.keyarea .numlabel { position:absolute; left:50%; top:50%; font-weight: bold; }
.keyarea .output { display: block; font-family: monospace; font-size: 1.25em; } .keyarea .output { display: block; font-family: monospace; font-size: 1.25em; }
.keyarea .qrcode_public { display: inline-block; float: left; } .keyarea .qrcode_public { display: inline-block; float: left; }
.keyarea .qrcode_private { display: inline-block; position: relative; top: 28px; float: right; } .keyarea .qrcode_private { display: inline-block; position: relative; top: 28px; float: right; }
@ -6447,6 +6448,8 @@ input[type=checkbox] { position: relative; z-index: 20; }
-o-transform-origin:top left; -o-transform:rotate(-90deg); -o-transform-origin:top left; -o-transform:rotate(-90deg);
transform-origin:top left; transform:rotate(-90deg); transform-origin:top left; transform:rotate(-90deg);
} }
#paperbulkarea { padding: 50px; 0 0 0; }
#paperbulktextarea { font-size: 90%; width: 98%; margin: 4px 0 0 0; }
#bulkarea .body { padding: 5px 0 0 0; } #bulkarea .body { padding: 5px 0 0 0; }
#bulkarea .format { font-style: italic; font-size: 90%; } #bulkarea .format { font-style: italic; font-size: 90%; }
#bulktextarea { font-size: 90%; width: 98%; margin: 4px 0 0 0; } #bulktextarea { font-size: 90%; width: 98%; margin: 4px 0 0 0; }
@ -6585,6 +6588,7 @@ input[type=checkbox] { position: relative; z-index: 20; }
#singlesafety { border: 0; } #singlesafety { border: 0; }
#paperarea .keyarea:first-child { border-top: 2px solid #009900; } #paperarea .keyarea:first-child { border-top: 2px solid #009900; }
#paperarea .keyarea.art:first-child { border: 0; } #paperarea .keyarea.art:first-child { border: 0; }
#paperbulkarea { display: none; }
.pagebreak { height: 1px; } .pagebreak { height: 1px; }
.paper #logo { display: none; } .paper #logo { display: none; }
.menu, .footer, .commands, #tagline, #faqs, #culturemenu { display: none; } .menu, .footer, .commands, #tagline, #faqs, #culturemenu { display: none; }
@ -6698,6 +6702,9 @@ input[type=checkbox] { position: relative; z-index: 20; }
</div> </div>
</div> </div>
<div id="paperkeyarea"></div> <div id="paperkeyarea"></div>
<div id="paperbulkarea">
<textarea rows="20" cols="40" id="paperbulktextarea" readonly></textarea>
</div>
</div> </div>
<div id="bulkarea" class="walletarea"> <div id="bulkarea" class="walletarea">
@ -9821,6 +9828,7 @@ ninja.wallets.paperwallet = {
ninja.wallets.paperwallet.useArtisticWallet = useArtisticWallet; ninja.wallets.paperwallet.useArtisticWallet = useArtisticWallet;
ninja.wallets.paperwallet.pageBreakAt = pageBreakAt; ninja.wallets.paperwallet.pageBreakAt = pageBreakAt;
document.getElementById("paperkeyarea").innerHTML = ""; document.getElementById("paperkeyarea").innerHTML = "";
document.getElementById("paperbulktextarea").value = "";
if (ninja.wallets.paperwallet.encrypt) { if (ninja.wallets.paperwallet.encrypt) {
if (passphrase == "") { if (passphrase == "") {
alert(ninja.translator.get("bip38alertpassphraserequired")); alert(ninja.translator.get("bip38alertpassphraserequired"));
@ -9876,6 +9884,7 @@ ninja.wallets.paperwallet = {
// generate bitcoin address, private key, QR Code and update information in the HTML // generate bitcoin address, private key, QR Code and update information in the HTML
// idPostFix: 1, 2, 3, etc. // idPostFix: 1, 2, 3, etc.
generateNewWallet: function (idPostFix) { generateNewWallet: function (idPostFix) {
var paperBulkTextArea = document.getElementById("paperbulktextarea");
if (ninja.wallets.paperwallet.encrypt) { if (ninja.wallets.paperwallet.encrypt) {
var compressed = true; var compressed = true;
ninja.privateKey.BIP38GenerateECAddressAsync(ninja.wallets.paperwallet.intermediatePoint, compressed, function (address, encryptedKey) { ninja.privateKey.BIP38GenerateECAddressAsync(ninja.wallets.paperwallet.intermediatePoint, compressed, function (address, encryptedKey) {
@ -9886,6 +9895,7 @@ ninja.wallets.paperwallet = {
else { else {
ninja.wallets.paperwallet.showWallet(idPostFix, address, encryptedKey); ninja.wallets.paperwallet.showWallet(idPostFix, address, encryptedKey);
} }
paperBulkTextArea.value += address + "\n";
}); });
} }
else { else {
@ -9899,6 +9909,7 @@ ninja.wallets.paperwallet = {
else { else {
ninja.wallets.paperwallet.showWallet(idPostFix, bitcoinAddress, privateKeyWif); ninja.wallets.paperwallet.showWallet(idPostFix, bitcoinAddress, privateKeyWif);
} }
paperBulkTextArea.value += bitcoinAddress + "\n";
} }
}, },
@ -9909,6 +9920,7 @@ ninja.wallets.paperwallet = {
} }
var walletHtml = var walletHtml =
"<div class='numlabel'>["+i+"]</div>" +
"<div class='public'>" + "<div class='public'>" +
"<div id='qrcode_public" + i + "' class='qrcode_public'></div>" + "<div id='qrcode_public" + i + "' class='qrcode_public'></div>" +
"<div class='pubaddress'>" + "<div class='pubaddress'>" +

3
src/bitaddress-ui.html
View file

@ -208,6 +208,9 @@
</div> </div>
</div> </div>
<div id="paperkeyarea"></div> <div id="paperkeyarea"></div>
<div id="paperbulkarea">
<textarea rows="20" cols="40" id="paperbulktextarea" readonly></textarea>
</div>
</div> </div>
<div id="bulkarea" class="walletarea"> <div id="bulkarea" class="walletarea">

4
src/main.css
View file

@ -11,6 +11,7 @@ hr { margin: 20px 0; border-top: 2px dashed #008000; }
.keyarea .pubaddress { display: inline-block; height: 40px; padding: 0 0 0 10px; float: left; } .keyarea .pubaddress { display: inline-block; height: 40px; padding: 0 0 0 10px; float: left; }
.keyarea .privwif { margin: 0; float: right; text-align: right; padding: 0 20px 0 0; position: relative; } .keyarea .privwif { margin: 0; float: right; text-align: right; padding: 0 20px 0 0; position: relative; }
.keyarea .label { font-weight: bold; } .keyarea .label { font-weight: bold; }
.keyarea .numlabel { position:absolute; left:50%; top:50%; font-weight: bold; }
.keyarea .output { display: block; font-family: monospace; font-size: 1.25em; } .keyarea .output { display: block; font-family: monospace; font-size: 1.25em; }
.keyarea .qrcode_public { display: inline-block; float: left; } .keyarea .qrcode_public { display: inline-block; float: left; }
.keyarea .qrcode_private { display: inline-block; position: relative; top: 28px; float: right; } .keyarea .qrcode_private { display: inline-block; position: relative; top: 28px; float: right; }
@ -88,6 +89,8 @@ input[type=checkbox] { position: relative; z-index: 20; }
-o-transform-origin:top left; -o-transform:rotate(-90deg); -o-transform-origin:top left; -o-transform:rotate(-90deg);
transform-origin:top left; transform:rotate(-90deg); transform-origin:top left; transform:rotate(-90deg);
} }
#paperbulkarea { padding: 50px; 0 0 0; }
#paperbulktextarea { font-size: 90%; width: 98%; margin: 4px 0 0 0; }
#bulkarea .body { padding: 5px 0 0 0; } #bulkarea .body { padding: 5px 0 0 0; }
#bulkarea .format { font-style: italic; font-size: 90%; } #bulkarea .format { font-style: italic; font-size: 90%; }
#bulktextarea { font-size: 90%; width: 98%; margin: 4px 0 0 0; } #bulktextarea { font-size: 90%; width: 98%; margin: 4px 0 0 0; }
@ -226,6 +229,7 @@ input[type=checkbox] { position: relative; z-index: 20; }
#singlesafety { border: 0; } #singlesafety { border: 0; }
#paperarea .keyarea:first-child { border-top: 2px solid #009900; } #paperarea .keyarea:first-child { border-top: 2px solid #009900; }
#paperarea .keyarea.art:first-child { border: 0; } #paperarea .keyarea.art:first-child { border: 0; }
#paperbulkarea { display: none; }
.pagebreak { height: 1px; } .pagebreak { height: 1px; }
.paper #logo { display: none; } .paper #logo { display: none; }
.menu, .footer, .commands, #tagline, #faqs, #culturemenu { display: none; } .menu, .footer, .commands, #tagline, #faqs, #culturemenu { display: none; }

5
src/ninja.paperwallet.js
View file

@ -44,6 +44,7 @@ ninja.wallets.paperwallet = {
ninja.wallets.paperwallet.useArtisticWallet = useArtisticWallet; ninja.wallets.paperwallet.useArtisticWallet = useArtisticWallet;
ninja.wallets.paperwallet.pageBreakAt = pageBreakAt; ninja.wallets.paperwallet.pageBreakAt = pageBreakAt;
document.getElementById("paperkeyarea").innerHTML = ""; document.getElementById("paperkeyarea").innerHTML = "";
document.getElementById("paperbulktextarea").value = "";
if (ninja.wallets.paperwallet.encrypt) { if (ninja.wallets.paperwallet.encrypt) {
if (passphrase == "") { if (passphrase == "") {
alert(ninja.translator.get("bip38alertpassphraserequired")); alert(ninja.translator.get("bip38alertpassphraserequired"));
@ -99,6 +100,7 @@ ninja.wallets.paperwallet = {
// generate bitcoin address, private key, QR Code and update information in the HTML // generate bitcoin address, private key, QR Code and update information in the HTML
// idPostFix: 1, 2, 3, etc. // idPostFix: 1, 2, 3, etc.
generateNewWallet: function (idPostFix) { generateNewWallet: function (idPostFix) {
var paperBulkTextArea = document.getElementById("paperbulktextarea");
if (ninja.wallets.paperwallet.encrypt) { if (ninja.wallets.paperwallet.encrypt) {
var compressed = true; var compressed = true;
ninja.privateKey.BIP38GenerateECAddressAsync(ninja.wallets.paperwallet.intermediatePoint, compressed, function (address, encryptedKey) { ninja.privateKey.BIP38GenerateECAddressAsync(ninja.wallets.paperwallet.intermediatePoint, compressed, function (address, encryptedKey) {
@ -109,6 +111,7 @@ ninja.wallets.paperwallet = {
else { else {
ninja.wallets.paperwallet.showWallet(idPostFix, address, encryptedKey); ninja.wallets.paperwallet.showWallet(idPostFix, address, encryptedKey);
} }
paperBulkTextArea.value += address + "\n";
}); });
} }
else { else {
@ -122,6 +125,7 @@ ninja.wallets.paperwallet = {
else { else {
ninja.wallets.paperwallet.showWallet(idPostFix, bitcoinAddress, privateKeyWif); ninja.wallets.paperwallet.showWallet(idPostFix, bitcoinAddress, privateKeyWif);
} }
paperBulkTextArea.value += bitcoinAddress + "\n";
} }
}, },
@ -132,6 +136,7 @@ ninja.wallets.paperwallet = {
} }
var walletHtml = var walletHtml =
"<div class='numlabel'>["+i+"]</div>" +
"<div class='public'>" + "<div class='public'>" +
"<div id='qrcode_public" + i + "' class='qrcode_public'></div>" + "<div id='qrcode_public" + i + "' class='qrcode_public'></div>" +
"<div class='pubaddress'>" + "<div class='pubaddress'>" +