rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
Code Issues Releases Activity

Merge pull request #988 from gvde/fix-preferred-contact-property

Browse Source 
Fix preferred contact property
This commit is contained in:
LEDfan 2015-09-09 16:08:03 +02:00
commit 8a6cf9e053
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/contacts.js
View File

@ -529,7 +529,7 @@ OC.Contacts = OC.Contacts || {};
var parameters = self.parametersFor(obj);
if(parameters.TYPE && parameters.TYPE.indexOf('PREF') !== -1) {
parameters.PREF = 1;
parameters.TYPE.splice(parameters.TYPE.indexOf('PREF', 1));
parameters.TYPE.splice(parameters.TYPE.indexOf('PREF'), 1);
}
if(checksum && checksum !== 'new') {
self.pushToUndo({
@ -1446,13 +1446,13 @@ OC.Contacts = OC.Contacts || {};
property.parameters.TYPE.push(property.label);
meta.push(property.label);
}
var preferred = false;
for(var param in property.parameters) {
if(property.parameters.hasOwnProperty(param)) {
//console.log('param', param);
if(param.toUpperCase() === 'PREF') {
var $cb = $property.find('input[type="checkbox"]');
$cb.attr('checked', 'checked');
meta.push($cb.attr('title'));
preferred = true;
continue;
}
else if(param.toUpperCase() === 'TYPE') {
for(var etype in property.parameters[param]) {
@ -1462,6 +1462,10 @@ OC.Contacts = OC.Contacts || {};
if(typeof et !== 'string') {
continue;
}
if(et.toUpperCase() === 'PREF') {
preferred = true;
continue;
}
$property.find('select.type option').each(function() {
if($(this).val().toUpperCase() === et.toUpperCase()) {
$(this).attr('selected', 'selected');
@ -1481,6 +1485,11 @@ OC.Contacts = OC.Contacts || {};
}
}
}
if(preferred) {
var $cb = $property.find('input[type="checkbox"]');
$cb.attr('checked', 'checked');
meta.push($cb.attr('title'));
}
var $meta = $property.find('.meta');
if($meta.length) {
$meta.html(meta.join('/'));