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

Monotone-Parent: f308101c72372244428eb66d3f81a23140676912 

Monotone-Revision: 795b040ab9bbddf7db971b30e8398290dcbd4ae8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-11T21:22:14
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-10-11 21:22:14 +00:00
parent 25ab64ec7d
commit ad7bf7f5d3
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2010-10-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/UIxAttendeesEditor.js:
(performSearchCallback): same as below.
* UI/WebServerResources/SOGoAutoCompletion.js:
(SOGoAutoCompletionInterface.performSearchCallback): when the
match string is not found in "completeEmail" (due to a match with a

19
UI/WebServerResources/UIxAttendeesEditor.js
View File

@ -237,12 +237,17 @@ function performSearchCallback(http) {
node.container = contact["container"];
}
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);
node.appendChild(document.createTextNode(matchBefore));
node.appendChild(new Element('strong').update(matchText));
node.appendChild(document.createTextNode(matchAfter));
if (matchPosition > -1) {
var matchBefore = completeEmail.substring(0, matchPosition);
var matchText = completeEmail.substring(matchPosition, matchPosition + data.searchText.length);
var matchAfter = completeEmail.substring(matchPosition + data.searchText.length);
node.appendChild(document.createTextNode(matchBefore));
node.appendChild(new Element('strong').update(matchText));
node.appendChild(document.createTextNode(matchAfter));
}
else {
node.appendChild(document.createTextNode(completeEmail));
}
if (contact["contactInfo"])
node.appendChild(document.createTextNode(" (" +
contact["contactInfo"] + ")"));
@ -533,7 +538,7 @@ function onInputBlur(event) {
// selecting a menu item
var visible = $(document.currentPopupMenu).getStyle('visibility') != 'hidden';
if (visible) {
log("XXX we return");
// log("XXX we return");
return;
}
}