MirrorMirror
/
lufi
mirror of https://framagit.org/fiat-tux/hat-softwares/lufi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary setTimeout

This commit is contained in:
Luc Didry 2015-10-11 12:57:20 +02:00 committed by Luc Didry
parent cd104cb512
commit 1119e736e7
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
themes/default/public/js/lufi-up.js
View File

@ -197,21 +197,17 @@ function sliceAndUpload(randomkey, i, parts, j, delay, del_at_first_view, short)
} else { } else {
window.ws.onclose = function() { window.ws.onclose = function() {
console.log('Websocket closed, waiting 10sec.'); console.log('Websocket closed, waiting 10sec.');
setTimeout(function() { window.ws = spawnWebsocket(0, function() {
window.ws = spawnWebsocket(0, function() { console.log('sending again slice '+(j + 1)+'/'+parts+' of file '+file.name);
console.log('sending again slice '+(j + 1)+'/'+parts+' of file '+file.name); window.ws.send(data+'XXMOJOXX'+JSON.stringify(encrypted));
window.ws.send(data+'XXMOJOXX'+JSON.stringify(encrypted)); });
});
}, 10000);
}; };
window.ws.onerror = function() { window.ws.onerror = function() {
console.log('Error on Websocket, waiting 10sec.'); console.log('Error on Websocket, waiting 10sec.');
setTimeout(function() { window.ws = spawnWebsocket(0, function() {
window.ws = spawnWebsocket(0, function() { console.log('sending again slice '+(j + 1)+'/'+parts+' of file '+file.name);
console.log('sending again slice '+(j + 1)+'/'+parts+' of file '+file.name); window.ws.send(data+'XXMOJOXX'+JSON.stringify(encrypted));
window.ws.send(data+'XXMOJOXX'+JSON.stringify(encrypted)); });
});
}, 10000);
}; };
window.ws.send(data+'XXMOJOXX'+JSON.stringify(encrypted)); window.ws.send(data+'XXMOJOXX'+JSON.stringify(encrypted));
} }
@ -384,13 +380,11 @@ function spawnWebsocket(i, callback) {
updateProgressBar(JSON.parse(e.data)); updateProgressBar(JSON.parse(e.data));
} }
ws.onerror = function() { ws.onerror = function() {
if (i < 5 && callback !== undefined) {
setTimeout(function() {
console.log('Retrying to send file '+i);
window.ws = spawnWebsocket(i + 1, callback);
}, 10000);
}
console.log('error'); console.log('error');
if (i < 5 && callback !== undefined) {
console.log('Retrying to send file '+i);
window.ws = spawnWebsocket(i + 1, callback);
}
} }
return ws; return ws;
} }