amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-09 04:19:43 +00:00
Code Issues Projects Releases Wiki Activity

Improve JavaScript for Contacts module

Browse Source
This commit is contained in:
Francis Lachapelle
2014-08-06 15:14:05 -04:00
parent ce4eb36efd
commit 773675519f
5 changed files with 316 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Contacts/addressbook-model.js
+65 -63
View File
@@ -1,114 +1,117 @@
(function() {
'use strict';
/* Constructor */
function AddressBook(futureAddressBookData) {
/* DATA IS IMMEDIATELY AVAILABLE */
// Data is immediately available
if (typeof futureAddressBookData.then !== 'function') {
angular.extend(this, futureAddressBookData);
return;
}
/* THE PROMISE WILL BE UNWRAPPED FIRST */
// The promise will be unwrapped first
this.$unwrap(futureAddressBookData);
}
/* THE FACTORY WE'LL USE TO REGISTER WITH ANGULAR */
AddressBook.$factory = ['$timeout', 'sgSettings', 'sgResource', 'sgContact', function($timeout, Settings, Resource, Contact) {
/* The factory we'll use to register with Angular */
AddressBook.$factory = ['$timeout', 'sgSettings', 'sgResource', 'sgCard', function($timeout, Settings, Resource, Card) {
angular.extend(AddressBook, {
$$resource: new Resource(Settings.baseURL),
$timeout: $timeout,
$Contact: Contact
$Card: Card
});
return AddressBook; // return constructor
}];
/* ANGULAR MODULE REGISTRATION */
angular.module('SOGo').factory('sgAddressBook', AddressBook.$factory);
/* Factory registration in Angular module */
angular.module('SOGo.Contacts').factory('sgAddressBook', AddressBook.$factory);
// AddressBook.$selectedId = function(addressbook_id) {
// if (addressbook_id) angular.extend(AddressBook, { $selected_id: addressbook_id });
// console.debug("selected id = " + AddressBook.$selected_id);
// return AddressBook.$selected_id;
// };
AddressBook.$all = function(data) {
if (data) {
this.$addressbooks = data;
}
return this.$addressbooks;
};
/* Fetch list of contacts */
/* Fetch list of cards */
AddressBook.$find = function(addressbook_id) {
var futureAddressBookData = this.$$resource.find(addressbook_id); // should return attributes of addressbook +
var futureAddressBookData = AddressBook.$$resource.find(addressbook_id); // should return attributes of addressbook +
// AddressBook.$selectedId(addressbook_id);
return new AddressBook(futureAddressBookData);
};
// Instance methods
/* Instance methods */
AddressBook.prototype.$id = function() {
var self = this;
return this.$futureAddressBookData.then(function(data) {
return data.id;
});
};
AddressBook.prototype.$getContact = function(contact_id) {
AddressBook.prototype.$filter = function(search) {
var self = this;
// return this.$futureAddressBookData.then(function(data) {
// return data.id;
// }).then(function(addressbook_id) {
var params = { 'search': 'name_or_address',
'value': search,
'sort': 'c_cn',
'asc': 'true' };
return this.$id().then(function(addressbook_id) {
var contact = AddressBook.$Contact.$find(addressbook_id, contact_id);
AddressBook.$timeout(function() {
self.contact = contact;
});
return contact.$futureContactData.then(function() {
return self.contact;
var futureAddressBookData = AddressBook.$$resource.filter(addressbook_id, params);
return futureAddressBookData.then(function(data) {
return AddressBook.$timeout(function() {
self.cards = data.cards;
return self.cards;
});
});
});
};
AddressBook.prototype.$resetContact = function() {
this.$getContact(this.contact.id);
AddressBook.prototype.$getCard = function(card_id) {
var self = this;
return this.$id().then(function(addressbook_id) {
var card = AddressBook.$Card.$find(addressbook_id, card_id);
AddressBook.$timeout(function() {
self.card = card;
});
return card.$futureCardData.then(function() {
angular.forEach(self.cards, function(o, i) {
if (o.c_name == card_id) {
angular.extend(self.card, o);
}
});
return self.card;
});
});
};
AddressBook.prototype.$resetCard = function() {
this.$getCard(this.card.id);
};
AddressBook.prototype.$viewerIsActive = function(editMode) {
return (typeof this.contact != "undefined" && !editMode);
return (!angular.isUndefined(this.card) && !editMode);
};
// AddressBook.prototype.$getContacts = function() {
// var self = this;
// return AddressBook.$timeout(function() {
// var contacts = [];
// angular.forEach(self.contacts, function(addressBookContact, index) {
// var contact = AddressBook.$Contact.$find(addressBookContact.c_name);
// angular.extend(contact, addressBookContact); // useless?
// this.push(contact);
// }, contacts);
// AddressBook.$timeout(function() {
// self.contacts = contacts;
// });
// var futureContactData = [];
// angular.forEach(contacts, function(contact, index) {
// this.push(contact.$futureContactData);
// }, futureContactData);
// return this._q.all(futureContactData).then(function() {
// //self.$$emitter.emit('update');
// return self.contacts;
// });
// });
// };
// Unwrap a promise
AddressBook.prototype.$unwrap = function(futureAddressBookData) {
var self = this;
this.$futureAddressBookData = futureAddressBookData;
this.$futureAddressBookData.then(function(data) {
// The success callback. Calling _.extend from $timeout will wrap it into a try/catch call
// and return a promise.
AddressBook.$timeout(function() { angular.extend(self, data); });
AddressBook.$timeout(function() {
angular.extend(self, data);
self.$id().then(function(addressbook_id) {
angular.forEach(AddressBook.$all(), function(o, i) {
if (o.id == addressbook_id) {
angular.extend(self, o);
}
});
});
});
});
};
@@ -117,13 +120,12 @@
var addressbook = {};
angular.forEach(this, function(value, key) {
if (key != 'constructor' &&
key != 'contact' &&
key != 'contacts' &&
key != 'card' &&
key != 'cards' &&
key[0] != '$') {
addressbook[key] = value;
}
});
console.debug(angular.toJson(addressbook));
return addressbook;
};
UI/WebServerResources/js/Contacts/contact-model.js → UI/WebServerResources/js/Contacts/card-model.js
+70 -48
View File
@@ -3,51 +3,76 @@
/* Constructor */
function Contact(futureContactData) {
function Card(futureCardData) {
/* DATA IS IMMEDIATELY AVAILABLE */
// if (!futureContactData.inspect) {
// angular.extend(this, futureContactData);
// if (!futureCardData.inspect) {
// angular.extend(this, futureCardData);
// return;
// }
/* THE PROMISE WILL BE UNWRAPPED FIRST */
this.$unwrap(futureContactData);
this.$unwrap(futureCardData);
}
Contact.$tel_types = [_('work'), 'home', 'cell', 'fax', 'pager'];
Contact.$email_types = ['work', 'home', 'pref'];
Contact.$url_types = ['work', 'home', 'pref'];
Contact.$address_types = ['work', 'home'];
Card.$tel_types = ['work', 'home', 'cell', 'fax', 'pager'];
Card.$email_types = ['work', 'home', 'pref'];
Card.$url_types = ['work', 'home', 'pref'];
Card.$address_types = ['work', 'home'];
/* THE FACTORY WE'LL USE TO REGISTER WITH ANGULAR */
Contact.$factory = ['$timeout', 'sgSettings', 'sgResource', function($timeout, Settings, Resource) {
angular.extend(Contact, {
Card.$factory = ['$timeout', 'sgSettings', 'sgResource', function($timeout, Settings, Resource) {
angular.extend(Card, {
$$resource: new Resource(Settings.baseURL),
$timeout: $timeout
});
return Contact; // return constructor
return Card; // return constructor
}];
/* ANGULAR MODULE REGISTRATION */
angular.module('SOGo').factory('sgContact', Contact.$factory);
angular.module('SOGo.Contacts')
.factory('sgCard', Card.$factory)
.directive('sgAddress', function() {
return {
restrict: 'A',
replace: true,
scope: { data: '=sgAddress' },
controller: ['$scope', function($scope) {
$scope.addressLines = function(data) {
var lines = [];
if (data.street) lines.push(data.street);
if (data.street2) lines.push(data.street2);
var locality_region = [];
if (data.locality) locality_region.push(data.locality);
if (data.region) locality_region.push(data.region);
if (locality_region.length > 0) lines.push(locality_region.join(', '));
if (data.country) lines.push(data.country);
if (data.postalcode) lines.push(data.postalcode);
return lines.join('<br>');
};
}],
template: '<address ng-bind-html="addressLines(data)"></address>'
}
});
/* FETCH A UNIT */
Contact.$find = function(addressbook_id, contact_id) {
Card.$find = function(addressbook_id, card_id) {
/* FALLS BACK ON AN INSTANCE OF RESOURCE */
// Fetch data over the wire.
var futureContactData = this.$$resource.find([addressbook_id, contact_id].join('/'));
var futureCardData = this.$$resource.find([addressbook_id, card_id].join('/'));
if (contact_id) return new Contact(futureContactData); // a single contact
if (card_id) return new Card(futureCardData); // a single card
return Contact.$unwrapCollection(futureContactData); // a collection of contacts
return Card.$unwrapCollection(futureCardData); // a collection of cards
};
// Instance methods
Contact.prototype.$id = function() {
Card.prototype.$id = function() {
//var self = this;
return this.$futureAddressBookData.then(function(data) {
return data.id;
@@ -55,20 +80,19 @@
};
// Unwrap a promise
Contact.prototype.$unwrap = function(futureContactData) {
Card.prototype.$unwrap = function(futureCardData) {
var self = this;
this.$futureContactData = futureContactData;
this.$futureContactData.then(function(data) {
this.$futureCardData = futureCardData;
this.$futureCardData.then(function(data) {
// The success callback. Calling _.extend from $timeout will wrap it into a try/catch call.
// I guess this is the only reason to do this.
Contact.$timeout(function() {
Card.$timeout(function() {
angular.extend(self, data);
});
});
};
Contact.prototype.$fullname = function() {
Card.prototype.$fullname = function() {
var fn = this.fn || '';
if (fn.length == 0) {
var names = [];
@@ -91,7 +115,7 @@
return fn;
};
Contact.prototype.$description = function() {
Card.prototype.$description = function() {
var description = [];
if (this.title) description.push(this.title);
if (this.role) description.push(this.role);
@@ -106,30 +130,29 @@
return description.join(', ');
};
Contact.prototype.$birthday = function() {
Card.prototype.$birthday = function() {
return new Date(this.birthday*1000);
};
Contact.prototype.$isContact = function() {
Card.prototype.$isCard = function() {
return this.tag == 'VCARD';
};
Contact.prototype.$isList = function() {
Card.prototype.$isList = function() {
return this.tag == 'VLIST';
};
Contact.prototype.$delete = function(attribute, index) {
Card.prototype.$delete = function(attribute, index) {
if (index > -1 && this[attribute].length > index) {
this[attribute].splice(index, 1);
}
};
Contact.prototype.$addOrgUnit = function(orgUnit) {
Card.prototype.$addOrgUnit = function(orgUnit) {
if (angular.isUndefined(this.orgUnits)) {
this.orgUnits = [{value: orgUnit}];
}
else {
console.debug(angular.toJson(this.orgUnits));
for (var i = 0; i < this.orgUnits.length; i++) {
if (this.orgUnits[i].value == orgUnit) {
break;
@@ -141,7 +164,7 @@
return this.orgUnits.length - 1;
};
Contact.prototype.$addCategory = function(category) {
Card.prototype.$addCategory = function(category) {
if (angular.isUndefined(this.categories)) {
this.categories = [{value: category}];
}
@@ -157,7 +180,7 @@
return this.categories.length - 1;
};
Contact.prototype.$addEmail = function(type) {
Card.prototype.$addEmail = function(type) {
if (angular.isUndefined(this.emails)) {
this.emails = [{type: type, value: ''}];
}
@@ -167,7 +190,7 @@
return this.emails.length - 1;
};
Contact.prototype.$addPhone = function(type) {
Card.prototype.$addPhone = function(type) {
if (angular.isUndefined(this.phones)) {
this.phones = [{type: type, value: ''}];
}
@@ -177,7 +200,7 @@
return this.phones.length - 1;
};
Contact.prototype.$addUrl = function(type, url) {
Card.prototype.$addUrl = function(type, url) {
if (angular.isUndefined(this.urls)) {
this.urls = [{type: type, value: url}];
}
@@ -187,7 +210,7 @@
return this.urls.length - 1;
};
Contact.prototype.$addAddress = function(type, postoffice, street, street2, locality, region, country, postalcode) {
Card.prototype.$addAddress = function(type, postoffice, street, street2, locality, region, country, postalcode) {
if (angular.isUndefined(this.addresses)) {
this.addresses = [{type: type, postoffice: postoffice, street: street, street2: street2, locality: locality, region: region, country: country, postalcode: postalcode}];
}
@@ -204,15 +227,15 @@
};
/* never call for now */
Contact.$unwrapCollection = function(futureContactData) {
Card.$unwrapCollection = function(futureCardData) {
var collection = {};
collection.$futureContactData = futureContactData;
collection.$futureCardData = futureCardData;
futureContactData.then(function(contacts) {
Contact.$timeout(function() {
angular.forEach(contacts, function(data, index) {
collection[data.id] = new Contact(data);
futureCardData.then(function(cards) {
Card.$timeout(function() {
angular.forEach(cards, function(data, index) {
collection[data.id] = new Card(data);
});
});
});
@@ -221,19 +244,18 @@
};
// $omit returns a sanitized object used to send to the server
Contact.prototype.$omit = function() {
var contact = {};
Card.prototype.$omit = function() {
var card = {};
angular.forEach(this, function(value, key) {
if (key != 'constructor' && key[0] != '$') {
contact[key] = value;
card[key] = value;
}
});
console.debug(angular.toJson(contact));
return contact;
return card;
};
Contact.prototype.$save = function() {
return Contact.$$resource.set([this.pid, this.id].join('/'), this.$omit()).then(function (data) {
Card.prototype.$save = function() {
return Card.$$resource.set([this.pid, this.id].join('/'), this.$omit()).then(function (data) {
return data;
});
};