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

Monotone-Parent: b9fb860f8f7838df1fa7d5d3aa5503299b0ca08a

Browse source 
Monotone-Revision: 69df71bbd74fc7ccbfdfda4d8e386bd2d00ce08a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-09-02T18:44:48
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2008-09-02 18:44:48 +00:00
parent 8a2f70f210
commit 6fa5b84ecd
4 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UI/WebServerResources/MailerUI.js
View file

@ -262,7 +262,7 @@ function deleteSelectedMessagesCallback(http) {
if (!nextRow)
nextRow = row.previous("tr");
// row.addClassName("deleted"); // when we'll offer "mark as deleted"
if (deleteMessageRequestCount == 0) {
if (nextRow) {
Mailer.currentMessages[Mailer.currentMailbox] = nextRow.getAttribute("id").substr(4);

2
UI/WebServerResources/UIxMailEditor.css
View file

@ -153,5 +153,5 @@ UL#attachments LI IMG
left: 0em;
right: 0em;
bottom: 0em;
top: 13em;
top: 999em;
width: 99%; }

28
UI/WebServerResources/UIxMailEditor.js
View file

@ -8,7 +8,7 @@ var MailEditor = {
addressBook: null,
currentField: null,
selectedIndex: -1,
delay: 500,
delay: 750,
delayedSearch: false
};
@ -273,7 +273,7 @@ function onTextFocus() {
}
function onTextKeyDown(event) {
if (event.keyCode == 9) {
if (event.keyCode == Event.KEY_TAB) {
if (event.shiftKey) {
var nodes = $("subjectRow").childNodesWithTag("input");
var objectInput = $(nodes[0]);
@ -341,20 +341,20 @@ function onContactKeydown(event) {
this.focussed = true;
return;
}
if (event.keyCode == 9) { // Tab
if (event.keyCode == Event.KEY_TAB) {
if (this.confirmedValue)
this.value = this.confirmedValue;
if (document.currentPopupMenu)
hideMenu(document.currentPopupMenu);
}
else if (event.keyCode == 0
|| event.keyCode == 8 // Backspace
|| event.keyCode == Event.KEY_BACKSPACE
|| event.keyCode == 32 // Space
|| event.keyCode > 47) {
this.confirmedValue = null;
MailEditor.selectedIndex = -1;
MailEditor.currentField = this;
if (this.value.length > 0 && !MailEditor.delayedSearch) {
if (this.value.length > 1 && MailEditor.delayedSearch == false) {
MailEditor.delayedSearch = true;
setTimeout("performSearch()", MailEditor.delay);
}
@ -363,17 +363,17 @@ function onContactKeydown(event) {
hideMenu(document.currentPopupMenu);
}
}
else if (event.keyCode == 13) {
else if (event.keyCode == Event.KEY_RETURN) {
preventDefault(event);
if (this.confirmedValue)
this.value = this.confirmedValue;
$(this).selectText(0, this.value.length);
$(this).select();
if (document.currentPopupMenu)
hideMenu(document.currentPopupMenu);
MailEditor.selectedIndex = -1;
}
else if ($('contactsMenu').getStyle('visibility') == 'visible') {
if (event.keyCode == 38) { // Up arrow
if (event.keyCode == Event.KEY_UP) { // Up arrow
if (MailEditor.selectedIndex > 0) {
var contacts = $('contactsMenu').select("li");
contacts[MailEditor.selectedIndex--].removeClassName("selected");
@ -381,7 +381,7 @@ function onContactKeydown(event) {
contacts[MailEditor.selectedIndex].addClassName("selected");
}
}
else if (event.keyCode == 40) { // Down arrow
else if (event.keyCode == Event.KEY_DOWN) { // Down arrow
var contacts = $('contactsMenu').select("li");
if (contacts.size() - 1 > MailEditor.selectedIndex) {
if (MailEditor.selectedIndex >= 0)
@ -402,7 +402,7 @@ function performSearch() {
document.contactLookupAjaxRequest.aborted = true;
document.contactLookupAjaxRequest.abort();
}
if (MailEditor.currentField.value.trim().length > 0) {
if (MailEditor.currentField.value.trim().length > 1) {
var urlstr = ( UserFolderURL + "Contacts/allContactSearch?search="
+ MailEditor.currentField.value );
document.contactLookupAjaxRequest =
@ -543,7 +543,8 @@ function initMailEditor() {
textarea.observe(ieEvents[i], onTextIEUpdateCursorPos, false);
}
initTabIndex($("addressList"), $$("div#subjectRow input").first(), textarea);
var subjectField = $$("div#subjectRow input").first();
initTabIndex($("addressList"), subjectField, textarea);
onWindowResize(null);
Event.observe(window, "resize", onWindowResize);
@ -632,10 +633,11 @@ function onWindowResize(event) {
addresslist.setStyle({ width: ($(this).width() - attachmentswidth - 10) + 'px' });
// Set textarea position
textarea.setStyle({ 'top': headerarea.select("hr").first().offsetTop + 'px' });
var hr = headerarea.select("hr").first();
textarea.setStyle({ 'top': hr.offsetTop + 'px' });
// Resize the textarea (message content)
textarea.rows = Math.round((window.height() - textarea.offsetTop) / rowheight);
textarea.rows = Math.floor((window.height() - textarea.offsetTop) / rowheight);
}
function onMailEditorClose(event) {

3
UI/WebServerResources/UIxMailPopupView.js
View file

@ -29,7 +29,8 @@ function onICalendarButtonClick(event) {
function onMenuDeleteMessage(event) {
if (window.opener && window.opener.open && !window.opener.closed) {
var rowId = window.name.substr(9);
var rowId_index = window.name.search(/[0-9]+$/);
var rowId = window.name.substr(rowId_index);
var messageId = window.opener.Mailer.currentMailbox + "/" + rowId;
var url = ApplicationBaseURL + messageId + "/trash";