diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-05-17 14:29:20 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-05-17 14:31:04 +0200 |
| commit | 2f1e60180962d77752ed2b630f4945ee676b2125 (patch) | |
| tree | fb6f9014f24cc17345ac973db02c8c13bb14b31e /apps/contacts/js | |
| parent | bfdb374a2c8287b4dea80696928d27aef96fa343 (diff) | |
| download | nextcloud-server-2f1e60180962d77752ed2b630f4945ee676b2125.tar.gz nextcloud-server-2f1e60180962d77752ed2b630f4945ee676b2125.zip | |
Contacts: Disable in-app import if encryption is enabled, and make an attempt of supporting IE uploads too. Can't test it though...
Diffstat (limited to 'apps/contacts/js')
| -rw-r--r-- | apps/contacts/js/contacts.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js index 94e3e350d71..d60d523542e 100644 --- a/apps/contacts/js/contacts.js +++ b/apps/contacts/js/contacts.js @@ -1287,7 +1287,7 @@ Contacts={ close : function(event, ui) { $(this).dialog('destroy').remove(); } - }); + }).css('overflow','visible'); } else { alert(jsondata.data.message); } @@ -1338,7 +1338,8 @@ Contacts={ $('#importaddressbook_dialog').find('.upload').click(function() { Contacts.UI.Addressbooks.droptarget.html(t('contacts', 'Uploading...')); Contacts.UI.loading(Contacts.UI.Addressbooks.droptarget, true); - $('#import_upload_start').trigger('click'); + //$('#import_upload_start').trigger('click'); + //return false; }); $('#importaddressbook_dialog').find('.upload').tipsy(); this.droptarget = $('#import_drop_target'); |