This commit is contained in:
Ludovic Marcotte
2013-06-19 15:07:19 -04:00
parent a764286879
commit 871115e349
13 changed files with 38 additions and 36 deletions
+13 -7
View File
@@ -806,19 +806,25 @@ function validateUploadForm () {
return rc;
}
function uploadCompleted(response) {
data = response.evalJSON(true);
jQuery('#uploadCancel').show();
var btn = jQuery('#uploadSubmit');
btn.removeClass("disabled");
btn.children('span').text(_('Upload'));
var div = $("uploadResults");
if (data.imported <= 0)
try {
data = response.evalJSON(true);
if (data.imported <= 0)
$("uploadResultsContent").update(_("An error occured while importing contacts."));
else if (data.imported == 0)
$("uploadResultsContent").update(_("No card was imported."));
else {
$("uploadResultsContent").update(_("A total of %{0} cards were imported in the addressbook.").formatted(data.imported));
refreshCurrentFolder();
}
} catch (e) {
$("uploadResultsContent").update(_("An error occured while importing contacts."));
else if (data.imported == 0)
$("uploadResultsContent").update(_("No card was imported."));
else {
$("uploadResultsContent").update(_("A total of %{0} cards were imported in the addressbook.").formatted(data.imported));
refreshCurrentFolder();
}
hideContactsImport();