Merge branch 'develop' of github.com:micahflee/onionshare into chat

This commit is contained in:
Saptak S 2020-07-04 13:42:20 +05:30
commit 41681f82ec
No known key found for this signature in database
GPG key ID: 2D9B32E54C68A3FB
25 changed files with 316 additions and 70 deletions

File diff suppressed because one or more lines are too long

2
share/static/js/jquery-3.5.1.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -4,6 +4,9 @@ $(function(){
$('#flashes').append($('<li>').addClass(category).text(message));
};
var scriptSrc = document.getElementById('receive-script').src;
var staticImgPath = scriptSrc.substr(0, scriptSrc.lastIndexOf( '/' )+1).replace('js', 'img');
// Intercept submitting the form
$('#send').submit(function(event){
event.preventDefault();
@ -38,7 +41,7 @@ $(function(){
// and update the status
if(event.loaded == event.total) {
$('.cancel', ajax.$upload_div).remove();
$('.upload-status', ajax.$upload_div).html('<img src="/static/img/ajax.gif" alt="" /> Waiting for data to finish traversing Tor network ...');
$('.upload-status', ajax.$upload_div).html('<img src="' + staticImgPath + '/ajax.gif" alt="" /> Waiting for data to finish traversing Tor network ...');
}
}, false);