X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=plugins%2Fqrcode%2Fshaarli-qrcode.js;fp=plugins%2Fqrcode%2Fshaarli-qrcode.js;h=3316d6f63d272b2e5b13215e61aae4a27d19e459;hb=9fbc42294e7667c5ef19cafa0d1fcfbc1c0f36a9;hp=fe77c4cdc47cbb4ae36471513908e950adfe8d6d;hpb=bc583903adfd768f115fae438e4d9ed1043682d9;p=github%2Fshaarli%2FShaarli.git diff --git a/plugins/qrcode/shaarli-qrcode.js b/plugins/qrcode/shaarli-qrcode.js index fe77c4cd..3316d6f6 100644 --- a/plugins/qrcode/shaarli-qrcode.js +++ b/plugins/qrcode/shaarli-qrcode.js @@ -28,14 +28,15 @@ // Show the QR-Code of a permalink (when the QR-Code icon is clicked). function showQrCode(caller,loading) -{ +{ // Dynamic javascript lib loading: We only load qr.js if the QR code icon is clicked: if (typeof(qr) == 'undefined') // Load qr.js only if not present. { if (!loading) // If javascript lib is still loading, do not append script to body. { - var element = document.createElement("script"); - element.src = "plugins/qrcode/qr-1.1.3.min.js"; + var basePath = document.querySelector('input[name="js_base_path"]').value; + var element = document.createElement("script"); + element.src = basePath + "/plugins/qrcode/qr-1.1.3.min.js"; document.body.appendChild(element); } setTimeout(function() { showQrCode(caller,true);}, 200); // Retry in 200 milliseconds. @@ -44,7 +45,7 @@ function showQrCode(caller,loading) // Remove previous qrcode if present. removeQrcode(); - + // Build the div which contains the QR-Code: var element = document.createElement('div'); element.id = 'permalinkQrcode'; @@ -57,11 +58,11 @@ function showQrCode(caller,loading) // Damn IE element.setAttribute('onclick', 'this.parentNode.removeChild(this);' ); } - + // Build the QR-Code: var image = qr.image({size: 8,value: caller.dataset.permalink}); if (image) - { + { element.appendChild(image); element.innerHTML += "
Click to close"; caller.parentNode.appendChild(element); @@ -87,4 +88,4 @@ function removeQrcode() elem.parentNode.removeChild(elem); } return false; -} \ No newline at end of file +}