Merge pull request #19 from lbryio/development

removed client-side template literals
This commit is contained in:
Bill Bittner 2017-06-04 11:10:08 -07:00 committed by GitHub
commit bab29984bf

View file

@ -137,23 +137,23 @@
}; };
if (selectedFile) { if (selectedFile) {
previewReader.readAsDataURL(selectedFile); // reads the data and sets the img src previewReader.readAsDataURL(selectedFile); // reads the data and sets the img src
claimName.value = selectedFile.name.substring(0, selectedFile.name.indexOf(".")); claimName.value = selectedFile.name.substring(0, selectedFile.name.indexOf('.'));
} else { } else {
preview.src = ""; preview.src = '';
} }
} }
function updatePublishStatus(msg){ function updatePublishStatus(msg){
document.getElementById("publish-status").innerHTML = msg; document.getElementById('publish-status').innerHTML = msg;
} }
uploader.listenOnSubmit(document.getElementById("publish-submit"), document.getElementById("siofu_input")); uploader.listenOnSubmit(document.getElementById('publish-submit'), document.getElementById('siofu_input'));
document.getElementById("publish-submit").addEventListener("click", function(event){ document.getElementById('publish-submit').addEventListener('click', function(event){
event.preventDefault(); event.preventDefault();
}) })
uploader.addEventListener("start", function(event){ uploader.addEventListener('start', function(event){
var name = document.getElementById('publish-name').value; var name = document.getElementById('publish-name').value;
var license = document.getElementById('publish-license').value; var license = document.getElementById('publish-license').value;
var nsfw = document.getElementById('publish-nsfw').value; var nsfw = document.getElementById('publish-nsfw').value;
@ -162,34 +162,33 @@
event.file.meta.license = license; event.file.meta.license = license;
event.file.meta.nsfw = nsfw; event.file.meta.nsfw = nsfw;
// set the html of the publish area // set the html of the publish area
document.getElementById("publish").innerHTML = '<div id="publish-status"></div><div id="progress-bar"></div>'; document.getElementById('publish').innerHTML = '<div id="publish-status"></div><div id="progress-bar"></div>';
// start the progress bar // start the progress bar
createProgressBar(document.getElementById("progress-bar"), 12); createProgressBar(document.getElementById('progress-bar'), 12);
}); });
uploader.addEventListener("progress", function(event){ uploader.addEventListener('progress', function(event){
var percent = event.bytesLoaded / event.file.size * 100; var percent = event.bytesLoaded / event.file.size * 100;
updatePublishStatus("File is " + percent.toFixed(2) + "% loaded to the server"); updatePublishStatus('File is ' + percent.toFixed(2) + '% loaded to the server');
}) })
socket.on("publish-status", function(msg){ socket.on('publish-status', function(msg){
updatePublishStatus(msg); updatePublishStatus(msg);
}) })
socket.on("publish-failure", function(msg){ socket.on('publish-failure', function(msg){
document.getElementById("publish").innerHTML = `<p>${msg}</p><p> --(✖╭╮✖)→ </p>`; document.getElementById('publish').innerHTML = '<p>' + msg + '</p><p> --(✖╭╮✖)→ </p>';
}) })
socket.on("publish-complete", function(msg){ socket.on('publish-complete', function(msg){
console.log("publish complete", msg); var publishResults = '<p>Your publish is complete!</p>';
var publishResults = `<p>You're publish is complete!</p>`; publishResults += '<p>Your Claim ID is: ' + msg.result.claim_id + '</p>';
publishResults += `<p>Your Claim ID is: ${msg.result.claim_id}</p>`; publishResults += '<p>Your Transaction ID is: <a href="https://explorer.lbry.io/#!/transaction?id=' + msg.result.txid + '">' + msg.result.txid + '</a></p>';
publishResults += `<p>Your Transaction ID is: <a href="https://explorer.lbry.io/#!/transaction?id=${msg.result.txid}">${msg.result.txid}</a></p>`; publishResults += '<p>Here is a link to the claim where your asset was published: <a href="https://spee.ch/' + msg.name + '">spee.ch/' + msg.name + '</a></p>';
publishResults += `<p>Here is a link to the claim where your asset was published: <a href="https://spee.ch/${msg.name}">spee.ch/${msg.name}</a></p>`; publishResults += '<p>Here is a direct link to your asset: <a href="https://spee.ch/' + msg.name + '/' + msg.result.claim_id + '">spee.ch/' + msg.name + '/' + msg.result.claim_id + '</a></p>';
publishResults += `<p>Here is a direct link to your asset: <a href="https://spee.ch/${msg.name}/${msg.result.claim_id}">spee.ch/${msg.name}/${msg.result.claim_id}</a></p>`; publishResults += '<p><i>NOTE: the transaction still needs to be mined by the network before you can access it! This may take a few minutes. To to view the transaction on the blockchain explorer click the Transaction ID link above.</i></p>';
publishResults += `<p><i>NOTE: the transaction still needs to be mined by the network before you can access it! This may take a few minutes. To to view the transaction on the blockchain explorer click the Transaction ID link above.</i></p>` publishResults += '<p><a href="/">Reload to publish another asset</a></p>';
publishResults += `<p><a href="/">Reload the page to publish another</a></p>`; document.getElementById('publish').innerHTML = publishResults;
document.getElementById("publish").innerHTML = publishResults;
}) })
</script> </script>