prevent sharing from making aditional http requests while scanning

additional requests to the server can block feedback of scannning depending on server configuration
remotes/origin/stable4
Robin Appelman 13 years ago
parent a69d3c3346
commit 0124809a42
  1. 1
      apps/files_sharing/js/share.js
  2. 3
      files/js/files.js

@ -2,6 +2,7 @@ $(document).ready(function() {
var shared_status = {};
if (typeof FileActions !== 'undefined') {
FileActions.register('all', 'Share', function(filename) {
if (scanFiles.scanning){return;}//workaround to prevent aditional http request block scanning feedback
var icon;
var file = $('#dir').val()+'/'+filename;
if(shared_status[file])

@ -347,6 +347,7 @@ $(document).ready(function() {
function scanFiles(force){
force=!!force; //cast to bool
scanFiles.scanning=true;
$('#scanning-message').show();
$('#fileList').remove();
var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force});
@ -356,6 +357,7 @@ function scanFiles(force){
$('#scan-current').text(data.file+'/');
});
scannerEventSource.listen('success',function(success){
scanFiles.scanning=false;
if(success){
window.location.reload();
}else{
@ -363,6 +365,7 @@ function scanFiles(force){
}
});
}
scanFiles.scanning=false;
function boolOperationFinished(data, callback) {
result = jQuery.parseJSON(data.responseText);

Loading…
Cancel
Save