BTCPrivate
/
lightningtip
mirror of https://github.com/BTCPrivate/lightningtip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed overflow error when creating QR codes with long messages

This commit is contained in:
michael1011 2018-03-26 18:03:38 +02:00
parent a6ff42f6a3
commit 58f432d04f
No known key found for this signature in database
GPG Key ID: 84D249BA71685D46
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
frontend/lightningTip.js
View File

@ -144,21 +144,19 @@ function showQRCode() {
// QR code was not shown yet
if (qrCode == null) {
console.log("Creating QR code");
var size = document.getElementById("lightningTipInvoice").clientWidth;
var qr = qrcode(10, "L");
qr.addData(invoice);
qr.make();
qrCode = qr.createImgTag(size / 60, 6);
createQRCode(10);
}
element.style.marginBottom = "1em";
element.innerHTML = qrCode;
var size = document.getElementById("lightningTipInvoice").clientWidth + "px";
var qrElement = element.children[0];
qrElement.style.height = size;
qrElement.style.width = size;
} else {
// Hide the QR code
console.log("Hiding QR code");
@ -170,6 +168,24 @@ function showQRCode() {
}
function createQRCode(typeNumber) {
try {
console.log("Creating QR code with type number: " + typeNumber);
var qr = qrcode(typeNumber, "L");
qr.addData(invoice);
qr.make();
qrCode = qr.createImgTag(6, 6);
} catch (e) {
console.log("Overflow error. Trying bigger type number");
createQRCode(typeNumber + 1);
}
}
function copyToClipboard(element) {
element.select();
@ -188,5 +204,11 @@ function showErrorMessage(message) {
error.parentElement.style.marginTop = "0.5em";
error.innerHTML = message;
document.getElementById("lightningTipGetInvoice").innerHTML = defaultGetInvoice;
var button = document.getElementById("lightningTipGetInvoice");
// Only necessary if it has a child (div with class spinner)
if (button.children.length !== 0) {
button.innerHTML = defaultGetInvoice;
}
}