diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-10 18:38:01 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-10 18:38:01 +0200 |
| commit | ef1b04619daa7b72ca1a8427702bd3552b848e6c (patch) | |
| tree | db3f22c8bd0e5cfb3fec2cda403fcaa20fe38214 /apps/calendar/js/loader.js | |
| parent | c83f418a024190fc7683b45a1009f01f2d039a17 (diff) | |
| parent | c11f6cc3f9121fbb337c248807b802c72b18087b (diff) | |
| download | nextcloud-server-ef1b04619daa7b72ca1a8427702bd3552b848e6c.tar.gz nextcloud-server-ef1b04619daa7b72ca1a8427702bd3552b848e6c.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar/js/loader.js')
| -rw-r--r-- | apps/calendar/js/loader.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js index 838521ec7f5..0fc5018e89c 100644 --- a/apps/calendar/js/loader.js +++ b/apps/calendar/js/loader.js @@ -63,7 +63,7 @@ Calendar_Import={ }); }, getimportstatus: function(progresskey){ - $.get(OC.filePath('calendar', 'ajax/import', 'import.php') + '?progress=1&progresskey=' + progresskey, function(percent){ + $.post(OC.filePath('calendar', 'ajax/import', 'import.php'), {progress:1,progresskey: progresskey}, function(percent){ $('#progressbar').progressbar('option', 'value', parseInt(percent)); if(percent < 100){ window.setTimeout('Calendar_Import.getimportstatus(\'' + progresskey + '\')', 500); |