diff options
Diffstat (limited to 'files')
| -rw-r--r-- | files/js/files.js | 7 | ||||
| -rw-r--r-- | files/templates/index.php | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/files/js/files.js b/files/js/files.js index 28259606cea..a896314faf0 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -347,10 +347,15 @@ $(document).ready(function() { function scanFiles(force){ force=!!force; //cast to bool + var fileCount=0; $('#scanning-message').show(); + $('#fileList').remove(); var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force}); + scanFiles.cancel=scannerEventSource.close.bind(scannerEventSource); scannerEventSource.listen('scanned',function(file){ - console.log(file);//TODO: make this into proper feedback + fileCount++; + $('#scan-count').text(fileCount+' files scanned'); + $('#scan-current').text(file); }); scannerEventSource.listen('success',function(success){ if(success){ diff --git a/files/templates/index.php b/files/templates/index.php index 92c579c2442..fa4643de75a 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -61,7 +61,10 @@ </p> </div> <div id="scanning-message"> + <h3> + <?php echo $l->t('Files are being scanned, please wait.');?> <span id='scan-count'></spann> + </h3> <p> - <?php echo $l->t('Files are being scanned, please wait.');?> + <?php echo $l->t('Current scanning');?> <span id='scan-current'></spann> </p> </div> |