Contacts: Used non-existent var.

diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
index 961e0f425c9cb53ff31aadf28c2007b926a78528..577ad1030645d85bcb4c570884180c005b88d76f 100644 (file)
--- a/apps/contacts/js/loader.js
+++ b/apps/contacts/js/loader.js
@@ -42,20 +42,20 @@ Contacts_Import={
                        }\r
                        $('#newaddressbook').attr('readonly', 'readonly');\r
                        $('#contacts').attr('disabled', 'disabled');\r
-                       var progresskey = $('#progresskey').val();
-                       $.post(OC.filePath('contacts', '', 'import.php') + '?progresskey='+progresskey, {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(jsondata){
+                       var progresskey = $('#progresskey').val();\r
+                       $.post(OC.filePath('contacts', '', 'import.php') + '?progresskey='+progresskey, {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(jsondata){\r
                                if(jsondata.status == 'success'){\r
                                        $('#progressbar').progressbar('option', 'value', 100);\r
                                        $('#import_done').find('p').html(t('contacts', 'Result: ') + jsondata.data.imported + t('contacts', ' imported, ') + jsondata.data.failed + t('contacts', ' failed.'));\r
                                } else {\r
-                                       $('#import_done').find('p').html(jsondata.data.message);\r
+                                       $('#import_done').find('p').html(jsondata.message);\r
                                }\r
                                $('#import_done').show().find('p').addClass('bold');\r
                                $('#progressbar').fadeOut('slow');\r
                        });\r
                        $('#form_container').css('display', 'none');\r
                        $('#progressbar_container').css('display', 'block');\r
-                       window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
+                       window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);\r
                });\r
                $('#contacts').change(function(){\r
                        if($('#contacts option:selected').val() == 'newaddressbook'){\r
@@ -65,11 +65,11 @@ Contacts_Import={
                        }\r
                });\r
        },\r
-       getimportstatus: function(progresskey){
-               $.get(OC.filePath('contacts', '', 'import.php') + '?progress=1&progresskey=' + progresskey, function(percent){
+       getimportstatus: function(progresskey){\r
+               $.get(OC.filePath('contacts', '', 'import.php') + '?progress=1&progresskey=' + progresskey, function(percent){\r
                        $('#progressbar').progressbar('option', 'value', parseInt(percent));\r
                        if(percent < 100){\r
-                               window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);
+                               window.setTimeout('Contacts_Import.getimportstatus(\'' + progresskey + '\')', 500);\r
                        }else{\r
                                $('#import_done').css('display', 'block');\r
                        }\r