- (2.9.8)
+ (2.9.9)
527B 5C82 B1F6 B2DB 72A0
ECBF 8749 7B91 6397 4F5A
@@ -7265,6 +7269,8 @@
seedCount: 0, // counter
lastInputTime: new Date().getTime(),
seedPoints: [],
+ isStillSeeding: true,
+ seederDependentWallets: ["singlewallet", "paperwallet", "bulkwallet", "vanitywallet", "splitwallet"],
// seed function exists to wait for mouse movement to add more entropy before generating an address
seed: function (evt) {
@@ -7272,11 +7278,8 @@
var timeStamp = new Date().getTime();
// seeding is over now we generate and display the address
if (ninja.seeder.seedCount == ninja.seeder.seedLimit) {
- ninja.seeder.seedCount++;
- ninja.wallets.singlewallet.open();
- document.getElementById("generate").style.display = "none";
- document.getElementById("menu").style.visibility = "visible";
- ninja.seeder.removePoints();
+ ninja.seeder.seedCount++;
+ ninja.seeder.seedingOver();
}
// seed mouse position X and Y when mouse movements are greater than 40ms apart.
else if ((ninja.seeder.seedCount < ninja.seeder.seedLimit) && evt && (timeStamp - ninja.seeder.lastInputTime) > 40) {
@@ -7294,11 +7297,8 @@
if (!evt) var evt = window.event;
// seeding is over now we generate and display the address
if (ninja.seeder.seedCount == ninja.seeder.seedLimit) {
- ninja.seeder.seedCount++;
- ninja.wallets.singlewallet.open();
- document.getElementById("generate").style.display = "none";
- document.getElementById("menu").style.visibility = "visible";
- ninja.seeder.removePoints();
+ ninja.seeder.seedCount++;
+ ninja.seeder.seedingOver();
}
// seed key press character
else if ((ninja.seeder.seedCount < ninja.seeder.seedLimit) && evt.which) {
@@ -7317,16 +7317,20 @@
showPool: function () {
var poolHex;
if (SecureRandom.poolCopyOnInit != null) {
- poolHex = Crypto.util.bytesToHex(SecureRandom.poolCopyOnInit);
- document.getElementById("seedpool").innerHTML = poolHex;
- document.getElementById("seedpooldisplay").innerHTML = poolHex;
+ poolHex = Crypto.util.bytesToHex(SecureRandom.poolCopyOnInit);
+ document.getElementById("seedpool").innerHTML = poolHex;
+ document.getElementById("seedpooldisplay").innerHTML = poolHex;
}
else {
- poolHex = Crypto.util.bytesToHex(SecureRandom.pool);
- document.getElementById("seedpool").innerHTML = poolHex;
- document.getElementById("seedpooldisplay").innerHTML = poolHex;
+ poolHex = Crypto.util.bytesToHex(SecureRandom.pool);
+ document.getElementById("seedpool").innerHTML = poolHex;
+ document.getElementById("seedpooldisplay").innerHTML = poolHex;
+ }
+ var percentSeeded = Math.round((ninja.seeder.seedCount / ninja.seeder.seedLimit) * 100) + "%";
+ document.getElementById("mousemovelimit").innerHTML = percentSeeded;
+ for (var wIndex in ninja.seeder.seederDependentWallets) {
+ document.getElementById(ninja.seeder.seederDependentWallets[wIndex]).innerHTML = percentSeeded;
}
- document.getElementById("mousemovelimit").innerHTML = (ninja.seeder.seedLimit - ninja.seeder.seedCount);
},
showPoint: function (x, y) {
@@ -7343,6 +7347,21 @@
document.body.removeChild(ninja.seeder.seedPoints[i]);
}
ninja.seeder.seedPoints = [];
+ },
+
+ seedingOver: function () {
+ ninja.seeder.isStillSeeding = false;
+ var walletType = ninja.tab.whichIsOpen();
+ if (walletType == null) {
+ ninja.tab.select("singlewallet");
+ } else {
+ ninja.tab.select(walletType)
+ }
+ document.getElementById("generate").style.display = "none";
+ // update labels for dependent wallets
+ var culture = (ninja.getQueryString()["culture"] == null ? "en" : ninja.getQueryString()["culture"]);
+ ninja.translator.translate(culture);
+ ninja.seeder.removePoints();
}
};
@@ -7439,16 +7458,45 @@
}
};
-ninja.tabSwitch = function (walletTab) {
- if (walletTab.className.indexOf("selected") == -1) {
- // unselect all tabs
- for (var wType in ninja.wallets) {
- document.getElementById(wType).className = "tab";
- ninja.wallets[wType].close();
- }
- walletTab.className += " selected";
- ninja.wallets[walletTab.getAttribute("id")].open();
- }
+ninja.tab = {
+ select: function (walletTab) {
+ // detect type: normally an HtmlElement/object but when string then get the element
+ if (typeof walletTab === 'string') {
+ walletTab = document.getElementById(walletTab);
+ }
+ var walletType = walletTab.getAttribute("id");
+
+ if (walletTab.className.indexOf("selected") == -1) {
+ // unselect all tabs
+ for (var wType in ninja.wallets) {
+ document.getElementById(wType).className = "tab";
+ ninja.wallets[wType].close();
+ }
+
+ // don't open tab if entropy still being collected
+ // exceptions: brainwallet detailwallet
+ if (ninja.seeder.isStillSeeding == false || walletType == "brainwallet" || walletType == "detailwallet") {
+ walletTab.className += " selected";
+ document.getElementById("generate").style.display = "none";
+ ninja.wallets[walletTab.getAttribute("id")].open();
+ }
+ else if (ninja.seeder.isStillSeeding == true && !(walletType == "brainwallet" || walletType == "detailwallet")) {
+ document.getElementById("generate").style.display = "block";
+ }
+ }
+ },
+
+ whichIsOpen: function () {
+ var isOpen;
+ for (var wType in ninja.wallets) {
+ isOpen = ninja.wallets[wType].isOpen();
+ if (isOpen) {
+ return wType;
+ }
+ }
+ return null;
+ }
+
};
ninja.getQueryString = function () {
@@ -7557,7 +7605,16 @@
"vanityalertinvalidinputpublickeysmatch": "Invalid input. The Public Key of both entries match. You must input two different keys.",
"vanityalertinvalidinputcannotmultiple": "Invalid input. Cannot multiply two public keys. Select 'Add' to add two public keys to get a bitcoin address.",
"vanityprivatekeyonlyavailable": "Only available when combining two private keys",
- "vanityalertinvalidinputprivatekeysmatch": "Invalid input. The Private Key of both entries match. You must input two different keys."
+ "vanityalertinvalidinputprivatekeysmatch": "Invalid input. The Private Key of both entries match. You must input two different keys.",
+
+ // header and menu html
+ "singlewallet": "Single Wallet",
+ "paperwallet": "Paper Wallet",
+ "bulkwallet": "Bulk Wallet",
+ "brainwallet": "Brain Wallet",
+ "vanitywallet": "Vanity Wallet",
+ "splitwallet": "Split Wallet",
+ "detailwallet": "Wallet Details"
},
"es": {
@@ -7590,6 +7647,7 @@
"bulkwallet": "Direcciones en masa",
"brainwallet": "Cartera mental",
"vanitywallet": "Cartera personalizada",
+ "splitwallet": "Split Wallet", //TODO: please translate
"detailwallet": "Detalles de la cartera",
// footer html
@@ -7728,6 +7786,7 @@
"bulkwallet": "Porte-Monnaie En Vrac",
"brainwallet": "Porte-Monnaie Cerveau",
"vanitywallet": "Porte-Monnaie Vanité",
+ "splitwallet": "Split Wallet", //TODO: please translate
"detailwallet": "Détails du Porte-Monnaie",
// footer html
@@ -7867,6 +7926,7 @@
"bulkwallet": "Πολλαπλά Πορτοφόλια",
"brainwallet": "Μνημονικό Πορτοφόλι",
"vanitywallet": "Πορτοφόλι Vanity",
+ "splitwallet": "Split Wallet", //TODO: please translate
"detailwallet": "Λεπτομέρειες Πορτοφολιού",
// footer html
@@ -8005,6 +8065,7 @@
"bulkwallet": "Portafogli multipli",
"brainwallet": "Brain Wallet",
"vanitywallet": "Vanity Wallet",
+ "splitwallet": "Split Wallet", //TODO: please translate
"detailwallet": "Dettagli portafoglio",
// footer html
@@ -8143,6 +8204,7 @@
"bulkwallet": "Massen-Wallet",
"brainwallet": "Kopf-Wallet",
"vanitywallet": "Personalisiertes Wallet",
+ "splitwallet": "Split Wallet", //TODO: please translate
"detailwallet": "Walletdetails",
// footer html
@@ -8281,6 +8343,7 @@
"bulkwallet": "Hromadná peněženka",
"brainwallet": "Myšlenková peněženka",
"vanitywallet": "Peněženka Vanity",
+ "splitwallet": "Split Wallet", //TODO: please translate
"detailwallet": "Detail peněženky",
// footer html
@@ -8564,6 +8627,7 @@
"bulkwallet": "大量ウォレット",
"brainwallet": "暗記ウォレット",
"vanitywallet": "カスタムウォレット",
+ "splitwallet": "Split Wallet", //TODO: please translate
"detailwallet": "ウォレットの詳細",
// footer html
@@ -8854,6 +8918,7 @@
"bulkwallet": "Несколько кошельков",
"brainwallet": "Умный кошелек",
"vanitywallet": "Персональный кошелек",
+ "splitwallet": "Split Wallet", //TODO: please translate
"detailwallet": "Детали кошелька",
// footer html
@@ -9006,6 +9071,10 @@