summaryrefslogtreecommitdiffstats
path: root/apps/contacts
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-04-21 21:40:20 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-04-22 00:44:53 +0200
commit16fc4dfd1add9a588ed6052a94fff03a37fa7dfd (patch)
tree8b8f271cd3132c234251a4827447b4e664953a44 /apps/contacts
parenta34631f84ecdcc856741428d9f3e137616a4c444 (diff)
downloadnextcloud-server-16fc4dfd1add9a588ed6052a94fff03a37fa7dfd.tar.gz
nextcloud-server-16fc4dfd1add9a588ed6052a94fff03a37fa7dfd.zip
Contacts: Fixed contact photo drag'n'drop upload - again...
Diffstat (limited to 'apps/contacts')
-rw-r--r--apps/contacts/js/contacts.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index e5b34e241cb..8af23ed398b 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -387,10 +387,11 @@ Contacts={
$('#note').data('checksum', this.data.NOTE[0]['checksum']);
$('#note').find('textarea').val(this.data.NOTE[0]['value']);
$('#note').show();
+ $('#contacts_propertymenu a[data-type="NOTE"]').parent().hide();
} else {
$('#note').data('checksum', '');
$('#note').find('textarea').val('');
- //$('#note').hide();
+ $('#note').hide();
}
},
loadSingleProperties:function() {
@@ -1437,19 +1438,19 @@ $(document).ready(function(){
$('#file_upload_start').live('change',function(){
Contacts.UI.Card.uploadPhoto(this.files);
});
- $('#contacts_details_photo').bind('dragover',function(event){
+ $('#contacts_details_photo_wrapper').bind('dragover',function(event){
console.log('dragover');
$(event.target).css('background-color','red');
event.stopPropagation();
event.preventDefault();
});
- $('#contacts_details_photo').bind('dragleave',function(event){
+ $('#contacts_details_photo_wrapper').bind('dragleave',function(event){
console.log('dragleave');
$(event.target).css('background-color','white');
//event.stopPropagation();
//event.preventDefault();
});
- $('#contacts_details_photo').bind('drop',function(event){
+ $('#contacts_details_photo_wrapper').bind('drop',function(event){
event.stopPropagation();
event.preventDefault();
console.log('drop');