amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-08 01:45:08 +00:00
Code Issues Projects Releases Wiki Activity

Fixed UIxListEditor autocompletion, Added support for vLists in email autocompletion

Browse Source 
Monotone-Parent: bd7bfc7a8af12b0b27f7a5b9d7a313a298cd99fb
Monotone-Revision: 8d584c13fa3ea25a05d8544d8b2ff67cd892fbf0

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-09-11T19:30:22
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-09-11 19:30:22 +00:00
parent 106e818d2e
commit 53ba65fcf1
7 changed files with 163 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2009-09-11 Cyril Robert <crobert@inverse.ca>
* UI/Contacts/UIxContactFoldersView.m (allContactSearchAction): Added
support for excludeLists, to prevent listing vList entries.
2009-09-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MainUI/SOGoUserHomePage.m (-logoffAction): adjusted to handle
UI/Contacts/UIxContactFoldersView.m
+13 -3
View File
@@ -195,13 +195,14 @@
NSMutableDictionary *uniqueContacts;
unsigned int i, j;
NSSortDescriptor *commonNameDescriptor;
BOOL excludeGroups;
BOOL excludeGroups, excludeLists;
searchText = [self queryParameterForKey: @"search"];
if ([searchText length] > 0)
{
NSLog(@"Search all contacts: %@", searchText);
excludeGroups = [[self queryParameterForKey: @"excludeGroups"] boolValue];
excludeLists = [[self queryParameterForKey: @"excludeLists"] boolValue];
NS_DURING
folders = [[self clientObject] subFolders];
NS_HANDLER
@@ -235,11 +236,20 @@
{
contact = [contacts objectAtIndex: j];
mail = [contact objectForKey: @"c_mail"];
//NSLog(@" found %@ (%@)", [contact objectForKey: @"displayName"], mail);
//NSLog(@" found %@ (%@) ? %@", [contact objectForKey: @"c_name"], mail,
// [contact description]);
if ([mail isNotNull]
&& [uniqueContacts objectForKey: mail] == nil
&& !(excludeGroups && [contact objectForKey: @"isGroup"]))
[uniqueContacts setObject: contact forKey: mail];
[uniqueContacts setObject: contact forKey: mail];
else if (!excludeLists
&& [[contact objectForKey: @"c_name"] hasSuffix: @".vlf"])
{
[contact setObject: [folder nameInContainer]
forKey: @"container"];
[uniqueContacts setObject: contact
forKey: [contact objectForKey: @"c_name"]];
}
}
}
if ([uniqueContacts count] > 0)
UI/Templates/ContactsUI/UIxListEditor.wox
+1 -1
View File
@@ -9,7 +9,7 @@
className="UIxPageFrame"
title="name"
const:popup="YES"
const:jsFiles="UIxMailEditor.js"
const:jsFiles="UIxMailEditor.js,SOGoAutoCompletion.js"
>
<div class="popupMenu" id="contactsMenu">
<ul></ul>
UI/WebServerResources/SOGoAutoCompletion.js
+75 -19
View File
@@ -10,6 +10,9 @@ var SOGoAutoCompletionInterface = {
delay: 0.750,
delayedSearch: false,
menu: null,
baseUrl: null,
onListAdded: null,
endEditable: null,
bind: function () {
this.menu = $('contactsMenu');
@@ -30,6 +33,10 @@ var SOGoAutoCompletionInterface = {
this.uid = null;
if (document.currentPopupMenu)
hideMenu(document.currentPopupMenu);
if (this.endEditable)
this.endEditable ();
if (this.onListAdded)
this.onListAdded ();
}
else if (event.keyCode == 0
|| event.keyCode == Event.KEY_BACKSPACE
@@ -49,6 +56,10 @@ var SOGoAutoCompletionInterface = {
if (document.currentPopupMenu)
hideMenu(document.currentPopupMenu);
this.selectedIndex = -1;
if (this.endEditable)
this.endEditable ();
if (this.onListAdded)
this.onListAdded ();
}
else if (this.menu.getStyle('visibility') == 'visible') {
if (event.keyCode == Event.KEY_UP) { // Up arrow
@@ -58,6 +69,11 @@ var SOGoAutoCompletionInterface = {
this.value = contacts[this.selectedIndex].readAttribute("address");
this.uid = contacts[this.selectedIndex].uid;
contacts[this.selectedIndex].addClassName("selected");
var e = contacts[this.selectedIndex];
this.card = e.card;
this.mail = e.mail;
this.name = e.uname;
this.container = e.container;
}
}
else if (event.keyCode == Event.KEY_DOWN) { // Down arrow
@@ -69,10 +85,15 @@ var SOGoAutoCompletionInterface = {
this.value = contacts[this.selectedIndex].readAttribute("address");
this.uid = contacts[this.selectedIndex].uid;
contacts[this.selectedIndex].addClassName("selected");
var e = contacts[this.selectedIndex];
this.card = e.card;
this.mail = e.mail;
this.name = e.uname;
this.container = e.container;
}
}
}
},
},
onBlur: function (event) {
if (this.delayedSearch)
@@ -93,8 +114,12 @@ var SOGoAutoCompletionInterface = {
if (input.value.trim().length > 2) {
var urlstr = (UserFolderURL + "Contacts/allContactSearch?search="
+ encodeURIComponent(input.value));
if (input.baseUrl)
urlstr = input.baseUrl + encodeURIComponent(input.value);
if (input.excludeGroups)
urlstr += "&excludeGroups=1";
if (input.excludeLists)
urlstr += "&excludeLists=1";
if (input.animationParent)
startAnimation(input.animationParent);
document.contactLookupAjaxRequest =
@@ -125,14 +150,25 @@ var SOGoAutoCompletionInterface = {
// Populate popup menu
for (var i = 0; i < data.contacts.length; i++) {
var contact = data.contacts[i];
var completeEmail = contact["c_cn"] + " <" + contact["c_mail"] + ">";
var completeEmail = contact["c_cn"];
if (contact["c_mail"])
completeEmail += " <" + contact["c_mail"] + ">";
var node = new Element('li', { 'address': completeEmail });
var matchPosition = completeEmail.toLowerCase().indexOf(data.searchText.toLowerCase());
var matchBefore = completeEmail.substring(0, matchPosition);
var matchText = completeEmail.substring(matchPosition, matchPosition + data.searchText.length);
var matchAfter = completeEmail.substring(matchPosition + data.searchText.length);
list.appendChild(node);
node.uid = contact["c_mail"];
node.uid = contact['c_mail'];
node.card = contact['c_name'];
if (contact['c_name'].endsWith (".vlf")) {
node.container = contact['container'];
}
else {
node.mail = contact['c_mail'];
node.uname = contact['c_cn'];
node.container = contact['container'];
}
node.appendChild(document.createTextNode(matchBefore));
node.appendChild(new Element('strong').update(matchText));
node.appendChild(document.createTextNode(matchAfter));
@@ -143,9 +179,7 @@ var SOGoAutoCompletionInterface = {
// Show popup menu
var offsetScroll = Element.cumulativeScrollOffset(input);
var offset = Element.positionedOffset(input);
if (offset.top == 0)
offset = Element.cumulativeOffset(input);
var offset = Element.cumulativeOffset(input);
var top = offset[1] - offsetScroll[1] + node.offsetHeight + 3;
var height = 'auto';
var heightDiff = window.height() - offset[1];
@@ -165,7 +199,7 @@ var SOGoAutoCompletionInterface = {
$(document.body).stopObserving("click");
$(document.body).observe("click", onBodyClickMenuHandler);
}
else {
else { // Only one result
if (document.currentPopupMenu)
hideMenu(document.currentPopupMenu);
@@ -173,19 +207,29 @@ var SOGoAutoCompletionInterface = {
// Single result
var contact = data.contacts[0];
input.uid = contact[this.uidField];
var completeEmail = contact["c_cn"] + " <" + contact["c_mail"] + ">";
if (contact["c_cn"].substring(0, input.value.length).toUpperCase()
== input.value.toUpperCase())
input.value = completeEmail;
else
// The result matches email address, not user name
input.value += ' >> ' + completeEmail;
input.confirmedValue = completeEmail;
if (contact['c_name'].endsWith (".vlf") && this.onListAdded) {
this.container = contact['container'];
this.card = contact['c_name'];
this.onListAdded ();
}
else {
input.card = contact['c_name'];
input.mail = contact['c_mail'];
input.name = contact['c_cn'];
var completeEmail = contact["c_cn"] + " <" + contact["c_mail"] + ">";
if (contact["c_cn"].substring(0, input.value.length).toUpperCase()
== input.value.toUpperCase())
input.value = completeEmail;
else
// The result matches email address, not user name
input.value += ' >> ' + completeEmail;
input.confirmedValue = completeEmail;
var end = input.value.length;
$(input).selectText(start, end);
var end = input.value.length;
$(input).selectText(start, end);
this.selectedIndex = -1;
this.selectedIndex = -1;
}
}
}
}
@@ -201,9 +245,21 @@ var SOGoAutoCompletionInterface = {
if (e.tagName != 'LI')
e = e.up('LI');
if (e) {
var card = e.card;
this.card = card;
if (card.endsWith (".vlf") && this.onListAdded) {
this.container = e.container;
this.onListAdded ();
}
else {
this.mail = e.mail;
this.name = e.uname;
}
this.uid = e.uid;
this.value = e.readAttribute("address");
this.value = e.address;
this.confirmedValue = this.value;
if (this.endEditable)
this.endEditable ();
}
}
};
UI/WebServerResources/UIxListEditor.js
+32 -11
View File
@@ -14,26 +14,47 @@ function makeEditable (element) {
textField.value = tmp.trim ();
textField.value = textField.value.replace (/&lt;/, "<");
textField.value = textField.value.replace (/&gt;/, ">");
textField.observe ("keydown", interceptEnter);
element.appendChild (textField);
textField.addInterface (SOGoAutoCompletionInterface);
textField.focus ();
textField.select ();
textField.excludeLists = 1;
textField.menu = $("contactsMenu");
textField.endEditable = endEditable;
textField.addAnother = onReferenceAdd;
textField.baseUrl = window.location.href + "/../../contactSearch?search=";
}
function interceptEnter (e) {
if (e.keyCode == Event.KEY_RETURN) {
endAllEditables (null);
preventDefault (e);
return false;
function endEditable (event, element) {
var card;
var name;
var mail;
if (element) {
card = element.readAttribut("card");
mail = element.readAttribute("mail");
name = element.readAttribute("name");
}
else {
onContactKeydown(e);
if ($(this).tagName == "INPUT") {
element = this.ancestors ().first ();
card = this.readAttribute ("card");
name = this.readAttribute ("name");
mail = this.readAttribute ("mail");
}
else {
element = this;
card = element.childElements ().first ().readAttribute ("card");
mail = element.childElements ().first ().readAttribute ("mail");
name = element.childElements ().first ().readAttribute ("name");
}
}
}
element.writeAttribute ("card", card);
element.writeAttribute ("name", name);
element.writeAttribute ("mail", mail);
function endEditable (element) {
var tmp = "";
if (element.readAttribute ("card")) {
if (card) {
var tmp = element.childElements ().first ().value;
tmp = tmp.replace (/</, "&lt;");
tmp = tmp.replace (/>/, "&gt;");
@@ -50,7 +71,7 @@ function endAllEditables (e) {
var r = $$("TABLE#referenceList tbody tr td");
for (var i=0; i<r.length; i++) {
if (r[i] != this && r[i].hasClassName ("editing"))
endEditable ($(r[i]));
endEditable (null, $(r[i]));
}
}
UI/WebServerResources/UIxMailEditor.js
+1
View File
@@ -306,6 +306,7 @@ function initTabIndex(addressList, subjectField, msgArea) {
input.writeAttribute("tabindex", i++);
input.addInterface(SOGoAutoCompletionInterface);
input.uidField = "c_name";
input.onListAdded = expandContactList;
}
});
subjectField.writeAttribute("tabindex", i++);
UI/WebServerResources/UIxMailToSelection.js
+36 -4
View File
@@ -53,10 +53,10 @@ function checkAddresses() {
function fancyAddRow(shouldEdit, text, type) {
var addr = $('addr_' + lastIndex);
if (addr && addr.value == '') {
var input = $('subjectField');
if (input && input.value != '') {
input.focus();
input.select();
var sub = $('subjectField');
if (sub && sub.value != '') {
sub.focus();
sub.select();
return;
}
}
@@ -84,9 +84,41 @@ function fancyAddRow(shouldEdit, text, type) {
input.addInterface(SOGoAutoCompletionInterface);
input.focus();
input.select();
input.onListAdded = expandContactList;
}
}
function expandContactList (e) {
var url = UserFolderURL + "Contacts/" + this.container + "/"
+ this.card + "/properties";
triggerAjaxRequest (url, expandContactListCallback, this);
}
function expandContactListCallback (http) {
if (http.readyState == 4) {
var input = http.callbackData;
if (http.status == 200) {
var data = http.responseText.evalJSON(true);
if (data.length >= 1) {
var text = data[0][2];
if (data[0][1].length)
text = data[0][1] + " <" + data[0][2] + ">";
input.value = text;
}
if (data.length > 1) {
for (var i = 1; i < data.length; i++) {
var text = data[i][2];
if (data[i][1].length)
text = data[i][1] + " <" + data[i][2] + ">";
fancyAddRow(false, text, $(input).up("tr").down("select").value);
}
}
//subsequent attempts must be ignored
input.onListAdded = null;
}
}
}
function addressFieldGotFocus(sender) {
var idx;