rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-18 07:52:21 +01:00
Code Issues Releases Activity

Proper updating on deletion of contact photo. Fix #77

Browse Source
This commit is contained in:
Thomas Tanghus 2013-05-15 01:02:38 +02:00
parent 65c4b71965
commit 23b6e074da
3 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
js/contacts.js
View File

@ -307,9 +307,14 @@ OC.Contacts = OC.Contacts || {};
newvalue: $container.find('input.value').val()
});
self.setAsSaving(obj, false);
self.$fullelem.find('[data-element="' + element.toLowerCase() + '"]').hide();
$container.find('input.value').val('');
self.$addMenu.find('option[value="' + element.toUpperCase() + '"]').prop('disabled', false);
if(element === 'PHOTO') {
self.data.PHOTO[0].value = false;
self.data.thumbnail = null;
} else {
self.$fullelem.find('[data-element="' + element.toLowerCase() + '"]').hide();
$container.find('input.value').val('');
self.$addMenu.find('option[value="' + element.toUpperCase() + '"]').prop('disabled', false);
}
}
$(document).trigger('status.contact.updated', {
property: element,
@ -1439,13 +1444,14 @@ OC.Contacts = OC.Contacts || {};
$elem.css('background-image', 'url(data:image/png;base64,' + this.data.thumbnail + ')');
} else {
$elem.addClass('thumbnail');
$elem.removeAttr('style');
}
}
/**
* Render the PHOTO property.
*/
Contact.prototype.loadPhoto = function(dontloadhandlers) {
Contact.prototype.loadPhoto = function() {
var self = this;
var id = this.id || 'new',
backend = this.metadata.backend,
@ -1478,13 +1484,18 @@ OC.Contacts = OC.Contacts || {};
$('img.contactphoto').remove();
finishLoad(image);
})
.fail(function(defaultImage) {
.fail(function() {
console.log('Error getting photo, trying default image');
$('img.contactphoto').remove();
finishLoad(defaultImage);
$.when(self.storage.getDefaultPhoto())
.then(function(image) {
$('img.contactphoto').detach();
finishLoad(image);
});
});
}
if(!dontloadhandlers && this.isEditable()) {
if(this.isEditable()) {
this.$photowrapper.on('mouseenter', function(event) {
if($(event.target).is('.favorite') || !self.data) {
return;
@ -1500,6 +1511,7 @@ OC.Contacts = OC.Contacts || {};
});
$phototools.find('li a').tipsy();
$phototools.find('.action').off('click');
$phototools.find('.edit').on('click', function() {
$(document).trigger('request.edit.contactphoto', self.metaData());
});
@ -1509,7 +1521,7 @@ OC.Contacts = OC.Contacts || {};
$phototools.find('.upload').on('click', function() {
$(document).trigger('request.select.contactphoto.fromlocal', self.metaData());
});
if(this.data && this.data.PHOTO) {
if(this.getPreferredValue('PHOTO', false)) {
$phototools.find('.delete').show();
$phototools.find('.edit').show();
} else {
@ -1518,8 +1530,17 @@ OC.Contacts = OC.Contacts || {};
}
$(document).bind('status.contact.photoupdated', function(e, data) {
console.log('status.contact.photoupdated', data);
if(!self.data.PHOTO) {
self.data.PHOTO = [];
}
if(data.thumbnail) {
self.data.thumbnail = data.thumbnail;
self.data.PHOTO[0] = {value:true};
} else {
self.data.thumbnail = null;
self.data.PHOTO[0] = {value:false};
}
self.loadPhoto(true);
self.data.thumbnail = data.thumbnail;
self.setThumbnail(null, true);
});
}
@ -1717,6 +1738,10 @@ OC.Contacts = OC.Contacts || {};
if(['FN', 'EMAIL', 'TEL', 'ADR', 'CATEGORIES'].indexOf(data.property) !== -1) {
data.contact.getListItemElement().remove();
self.insertContact(data.contact.renderListItem(true));
} else if(data.property === 'PHOTO') {
$(document).trigger('status.contact.photoupdated', {
id: data.contact.getId()
});
}
});
$(document).bind('status.addressbook.removed', function(e, data) {
@ -1795,7 +1820,7 @@ OC.Contacts = OC.Contacts || {};
ContactList.prototype.showUncategorized = function() {
console.log('ContactList.showUncategorized');
for(var contact in this.contacts) {
if(this.contacts[contact].getPreferredValue('CATEGORIES', []).length > 0) {
if(this.contacts[contact].getPreferredValue('CATEGORIES', []).length === 0) {
this.contacts[contact].getListItemElement().show();
} else {
this.contacts[contact].getListItemElement().hide();

4
js/storage.js
View File

@ -228,12 +228,14 @@ OC.Contacts = OC.Contacts || {};
{backend: backend, addressbookid: addressbookid, contactid: contactid}
);
var defer = $.Deferred();
var self = this;
$.when(
$(photo).load(function() {
defer.resolve(photo);
})
.error(function() {
console.log('Error loading default photo', arguments)
console.log('Error loading contact photo')
defer.reject();
})
.attr('src', url + '?refresh=' + Math.random())
)

11
lib/contact.php
View File

@ -609,12 +609,16 @@ class Contact extends VObject\VCard implements IPIMObject {
return true;
}
public function cacheThumbnail(\OC_Image $image = null) {
public function cacheThumbnail(\OC_Image $image = null, $remove = false) {
$key = self::THUMBNAIL_PREFIX . $this->combinedKey();
//\OC_Cache::remove($key);
if(\OC_Cache::hasKey($key) && $image === null) {
if(\OC_Cache::hasKey($key) && $image === null && $remove === false) {
return \OC_Cache::get($key);
}
if($remove) {
\OC_Cache::remove($key);
return false;
}
if(is_null($image)) {
$this->retrieve();
$image = new \OC_Image();
@ -652,6 +656,9 @@ class Contact extends VObject\VCard implements IPIMObject {
public function __unset($key) {
parent::__unset($key);
if($key === 'PHOTO') {
$this->cacheThumbnail(null, true);
}
$this->setSaved(false);
}