LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Re-fixed SOGoAutoCompletion/UIxListEditor/UIxMailToSelection

Browse source 
Monotone-Parent: 6cdcf3923cda0c5dd25c5d82b40d7755957207e4
Monotone-Revision: 5b2a32ba5341455fbf5f685a68a8b18fd5d22fb8

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-09-14T20:43:50
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert 2009-09-14 20:43:50 +00:00
parent 69852c5371
commit 7399f16a85
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
UI/WebServerResources/SOGoAutoCompletion.js
View file

@ -70,10 +70,10 @@ var SOGoAutoCompletionInterface = {
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;
this.writeAttribute("card", e.readAttribute("card"));
this.writeAttribute("mail", e.readAttribute("mail"));
this.writeAttribute("name", e.readAttribute("uname"));
this.writeAttribute("container", e.readAttribute("container"));
}
}
else if (event.keyCode == Event.KEY_DOWN) { // Down arrow
@ -86,10 +86,10 @@ var SOGoAutoCompletionInterface = {
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;
this.writeAttribute("card", e.readAttribute("card"));
this.writeAttribute("mail", e.readAttribute("mail"));
this.writeAttribute("name", e.readAttribute("uname"));
this.writeAttribute("container", e.readAttribute("container"));
}
}
}
@ -159,15 +159,15 @@ var SOGoAutoCompletionInterface = {
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.card = contact['c_name'];
node.writeAttribute ("card", contact['c_name']);
node.writeAttribute ("uid", contact['c_mail']);
if (contact['c_name'].endsWith (".vlf")) {
node.container = contact['container'];
node.writeAttribute("container", contact['container']);
}
else {
node.mail = contact['c_mail'];
node.uname = contact['c_cn'];
node.container = contact['container'];
node.writeAttribute("mail", contact['c_mail']);
node.writeAttribute("uname", contact['c_cn']);
node.writeAttribute("container", contact['container']);
}
node.appendChild(document.createTextNode(matchBefore));
node.appendChild(new Element('strong').update(matchText));
@ -208,14 +208,14 @@ var SOGoAutoCompletionInterface = {
var contact = data.contacts[0];
input.uid = contact[this.uidField];
if (contact['c_name'].endsWith (".vlf") && this.onListAdded) {
this.container = contact['container'];
this.card = contact['c_name'];
this.writeAttribute("container", contact['container']);
this.writeAttribute("card", contact['c_name']);
this.onListAdded ();
}
else {
input.card = contact['c_name'];
input.mail = contact['c_mail'];
input.name = contact['c_cn'];
input.writeAttribute("card", contact['c_name']);
input.writeAttribute("mail", contact['c_mail']);
input.writeAttribute("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())
@ -245,18 +245,18 @@ var SOGoAutoCompletionInterface = {
if (e.tagName != 'LI')
e = e.up('LI');
if (e) {
var card = e.card;
this.card = card;
var card = e.readAttribute("card");
this.writeAttribute("card", card);
if (card.endsWith (".vlf") && this.onListAdded) {
this.container = e.container;
this.writeAttribute("container", e.readAttribute("container"));
this.onListAdded ();
}
else {
this.mail = e.mail;
this.name = e.uname;
this.writeAttribute("mail", e.readAttribute("mail"));
this.writeAttribute("name", e.readAttribute("uname"));
}
this.uid = e.uid;
this.value = e.address;
this.writeAttribute("uid", e.readAttribute("uid"));
this.value = e.readAttribute("address");
this.confirmedValue = this.value;
if (this.endEditable)
this.endEditable ();

4
UI/WebServerResources/UIxMailToSelection.js
View file

@ -89,8 +89,8 @@ function fancyAddRow(shouldEdit, text, type) {
}
function expandContactList (e) {
var url = UserFolderURL + "Contacts/" + this.container + "/"
+ this.card + "/properties";
var url = UserFolderURL + "Contacts/" + this.readAttribute("container") + "/"
+ this.readAttribute("card") + "/properties";
triggerAjaxRequest (url, expandContactListCallback, this);
}
function expandContactListCallback (http) {