Merge branch 'v2' of ksamuel-github:/Tygs/0bin into v2

This commit is contained in:
ksamuel 2020-08-12 14:14:28 +02:00
commit 65578a4c72
2 changed files with 4 additions and 3 deletions

View File

@ -613,7 +613,8 @@ window.zerobin = {
}
}
return total * 250 / size;
// return total * 250 / size;
return total * 1000 / size;
},
// prevent defaults
@ -740,7 +741,7 @@ if (content && key) {
function (content) {
/* Decrypted content goes back to initial container*/
document.querySelector('#paste-content').innerHTML = content;
document.querySelector('#paste-content').innerText = content;
if (content.indexOf('data:image') == 0) {
// Display Image

View File

@ -57,7 +57,7 @@
%if expiration:
<span id="expiration-tag">Expire {{ expiration }}</span>
%end
<pre id="paste-content" class="prettyprint">
<code>
{{ paste.content }}