merge of 'f0bbd5c2ee25d0180b238170194330bf01bfa9fd'

and 'fb988c964ef041fc784d33b6c0cf192735fe88a0'

Monotone-Parent: f0bbd5c2ee25d0180b238170194330bf01bfa9fd
Monotone-Parent: fb988c964ef041fc784d33b6c0cf192735fe88a0
Monotone-Revision: 497c7c0a555d415e36d1f2aba0f96b960a3f0c8c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-16T21:17:09
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2010-06-16 21:17:09 +00:00
commit 9c6a95c49b
7 changed files with 44 additions and 4 deletions

View file

@ -1,3 +1,16 @@
2010-06-16 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxListEditor.js (onDocumentKeydown):
submit form when pressing the return key.
* UI/WebServerResources/UIxContactEditor.js (onDocumentKeydown):
idem.
* UI/WebServerResources/SOGoAutoCompletion.js
(performSearchCallback): fixed the position of the popup menu when
the input is within a relatively positioned div (mainly the
contacts list editor).
2010-06-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Scheduler/UIxCalListingActions.m

View file

@ -224,7 +224,7 @@
><var:foreach list="columnsDisplayOrder" item="currentColumn">
<th var:class="currentColumn.headerClass" var:id="currentColumn.headerId">
<var:if condition="currentColumn.value" const:value="Flagged">
<img rsrc:src="empty.gif" width="100%" height="100%" const:title="" />
<entity name="nbsp"/>
</var:if>
<var:if condition="currentColumn.value" const:value="Attachment">
<img rsrc:src="title_attachment_14x14.png" label:title="$currentColumn.value" width="14"

View file

@ -1658,9 +1658,10 @@ function initMailer(event) {
}
else
Event.observe(window, "beforeunload", onUnload);
onMessageListResize();
}
onMessageListResize();
onWindowResize.defer();
Event.observe(window, "resize", onWindowResize);
}

View file

@ -191,9 +191,10 @@ var SOGoAutoCompletionInterface = {
}
// Show popup menu
var div = Element.up(input, 'DIV');
var offsetScroll = Element.cumulativeScrollOffset(input);
var offset = Element.positionedOffset(input);
if (offset.top < 50)
if (div.getStyle('position') == 'relative')
// Hack for some situations where the offset must be computed differently
offset = Element.cumulativeOffset(input);
var top = offset.top - offsetScroll.top + node.offsetHeight + 3;

View file

@ -62,7 +62,7 @@ SOGoMailDataSource = Class.create({
}
}
else {
alert("SOGoMailDataSource._loadCallback Error " + http.status + ": " + http.responseText);
log("SOGoMailDataSource._loadCallback Error " + http.status + ": " + http.responseText);
}
},

View file

@ -136,6 +136,17 @@ function onEditorSubmitClick(event) {
this.blur();
}
function onDocumentKeydown(event) {
var target = Event.element(event);
if (target.tagName == "INPUT" || target.tagName == "SELECT") {
if (event.keyCode == Event.KEY_RETURN) {
var fcn = onEditorSubmitClick.bind($("submitButton"));
fcn();
Event.stop(event);
}
}
}
function initEditorForm() {
var tabsContainer = $("editorTabs");
var controller = new SOGoTabsController();
@ -148,6 +159,8 @@ function initEditorForm() {
$("cancelButton").observe("click", onEditorCancelClick);
$("submitButton").observe("click", onEditorSubmitClick);
Event.observe(document, "keydown", onDocumentKeydown);
}
document.observe("dom:loaded", initEditorForm);

View file

@ -140,6 +140,16 @@ function onEditorSubmitClick(event) {
$("mainForm").submit();
}
function onDocumentKeydown(event) {
var target = Event.element(event);
if (target.tagName == "INPUT") {
if (event.keyCode == Event.KEY_RETURN && target.menu == null) {
onEditorSubmitClick(event);
Event.stop(event);
}
}
}
function initListEditor() {
var table = $("referenceList");
table.multiselect = true;
@ -148,6 +158,8 @@ function initListEditor() {
$("referenceDelete").observe("click", onReferenceDelete);
$("cancelButton").observe("click", onEditorCancelClick);
$("submitButton").observe("click", onEditorSubmitClick);
Event.observe(document, "keydown", onDocumentKeydown);
}
document.observe("dom:loaded", initListEditor);