RPJosh
/
nc-gpxedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add progress percentage for save and load actions

merge-requests/1/head
Julien Veyssier 2017-01-28 04:48:04 +01:00
parent 4fb6e9be3b
commit 806fd3cc93
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
js/gpxedit.js
View File

@ -904,8 +904,25 @@ function loadFile(file){
path : file
}
var url = OC.generateUrl('/apps/gpxedit/getgpx');
$('#loadingpc').text('0 %');
showLoadingAnimation();
gpxedit.currentAjax = $.post(url, req).done(function (response) {
gpxedit.currentAjax = $.ajax({
type: "POST",
async: true,
url: url,
data: req,
xhr: function(){
var xhr = new window.XMLHttpRequest();
xhr.addEventListener("progress", function(evt) {
if (evt.lengthComputable) {
var percentComplete = evt.loaded / evt.total * 100;
$('#loadingpc').text('('+parseInt(percentComplete)+' %)');
}
}, false);
return xhr;
}
}).done(function (response) {
if ($('#clearbeforeload').is(':checked')){
clear();
}
@ -1122,13 +1139,31 @@ function saveAction(targetPath){
var saveFilePath = targetPath+'/'+$('input#saveName').val();
var gpxText = generateGpx();
hideExportingAnimation();
$('#savingpc').text('0 %');
showSavingAnimation();
var req = {
path: saveFilePath,
content: gpxText
}
var url = OC.generateUrl('/apps/gpxedit/savegpx');
$.post(url, req).done(function (response) {
$.ajax({
type: 'POST',
async: true,
url: url,
data: req,
xhr: function(){
var xhr = new window.XMLHttpRequest();
xhr.upload.addEventListener("progress", function(evt) {
if (evt.lengthComputable) {
var percentComplete = evt.loaded / evt.total * 100;
//Do something with upload progress here
$('#savingpc').text('('+parseInt(percentComplete)+' %)');
}
}, false);
return xhr;
}
}).done(function (response) {
hideSavingAnimation();
if (response.status === 'fiw'){
showSaveFailAnimation(saveFilePath, t('gpxedit', 'Impossible to write file')+' : '+t('gpxedit', 'write access denied'));

4
templates/gpxcontent.php
View File

@ -49,7 +49,7 @@ p($_['gpxedit_version']);
</div>
<div id="loading"><p>
<i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>
<?php p($l->t('loading file')); ?>&nbsp;</p>
<?php p($l->t('loading file')); ?>&nbsp;<i id="loadingpc"></i></p>
</div>
<div id="exporting"><p>
<i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>
@ -57,7 +57,7 @@ p($_['gpxedit_version']);
</div>
<div id="saving"><p>
<i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>
<?php p($l->t('saving file')); ?>&nbsp;</p>
<?php p($l->t('saving file')); ?>&nbsp;<i id="savingpc"></i></p>
</div>
<?php