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

Monotone-Parent: 10edd440c92ffe461411fef30ac170659d6adb56

Browse Source 
Monotone-Revision: c7d8a3cec350bffdaa0a577f4c254f4e092451f6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-11-03T19:40:12
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-11-03 19:40:12 +00:00
parent 9b9521703e
commit 6768f8f30e
3 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+6 -6
View File
@@ -10,7 +10,7 @@
title="name"
var:popup="isPopup">
<var:if condition="hideFrame" const:negate="YES">
<div class="menu" id="contactFolderMenu">
<div class="menu" id="contactFoldersMenu">
<ul>
<li
onmousedown="return false;"
@@ -60,11 +60,11 @@
><div class="toolbar">
<a href="#" class="toolbarButton" onclick="return onAddressBookAdd(this);"
><span class="toolbarButton"
><img rsrc:src="add-contact.gif" label:title="Add..."
><img rsrc:src="add-addressbook.png" label:title="Add an Addressbook..."
/></span></a
><a href="#" class="toolbarButton" onclick="return onAddressBookRemove(this);"
><span class="toolbarButton"
><img rsrc:src="remove-contact.gif" label:title="Remove"
><img rsrc:src="remove-addressbook.png" label:title="Remove the selected Addressbook"
/></span></a
></div></var:if>
@@ -77,7 +77,7 @@
class="_selected"
onmousedown="return false;"
onclick="return onRowClick(event);"
oncontextmenu="return onContactFolderContextMenu(event);"
oncontextmenu="return onContactFoldersContextMenu(event, this);"
><var:string value="currentContactFolderName" /></li
></var:if
><var:if condition="isFolderCurrent"
@@ -85,7 +85,7 @@
><li var:id="currentContactFolderId"
onmousedown="return false;"
onclick="return onRowClick(event);"
oncontextmenu="return onContactFolderContextMenu(event);"
oncontextmenu="return onContactFoldersContextMenu(event, this);"
><var:string value="currentContactFolderName" /></li
></var:if>
</var:foreach
@@ -95,7 +95,7 @@
var:external-addressbook="currentAdditionalFolder"
onmousedown="return false;"
onclick="return onRowClick(event);"
oncontextmenu="return onContactFolderContextMenu(event);"
oncontextmenu="return onContactFoldersContextMenu(event, this);"
><var:string value="currentAdditionalFolder" /></li
></var:foreach>
</ul>
UI/WebServerResources/ContactsUI.js
+35 -4
View File
@@ -160,13 +160,28 @@ function contactsListCallback(http)
log ("ajax fuckage");
}
function onContactFoldersContextMenu(event, element)
{
var menu = $("contactFoldersMenu");
menu.addEventListener("hideMenu", onContactFoldersContextMenuHide, false);
onMenuClick(event, "contactFoldersMenu");
var topNode = $("contactFolders");
var selectedNodes = topNode.getSelectedRows();
topNode.menuSelectedRows = selectedNodes;
for (var i = 0; i < selectedNodes.length; i++)
deselectNode(selectedNodes[i]);
topNode.menuSelectedEntry = element;
selectNode(element);
}
function onContactContextMenu(event, element)
{
var menu = $('contactMenu');
var menu = $("contactMenu");
menu.addEventListener("hideMenu", onContactContextMenuHide, false);
onMenuClick(event, 'contactMenu');
onMenuClick(event, "contactMenu");
var topNode = $('contactsList');
var topNode = $("contactsList");
var selectedNodes = topNode.getSelectedRows();
topNode.menuSelectedRows = selectedNodes;
for (var i = 0; i < selectedNodes.length; i++)
@@ -177,7 +192,23 @@ function onContactContextMenu(event, element)
function onContactContextMenuHide(event)
{
var topNode = $('contactsList');
var topNode = $("contactsList");
if (topNode.menuSelectedEntry) {
deselectNode(topNode.menuSelectedEntry);
topNode.menuSelectedEntry = null;
}
if (topNode.menuSelectedRows) {
var nodes = topNode.menuSelectedRows;
for (var i = 0; i < nodes.length; i++)
selectNode (nodes[i]);
topNode.menuSelectedRows = null;
}
}
function onContactFoldersContextMenuHide(event)
{
var topNode = $("contactFolders");
if (topNode.menuSelectedEntry) {
deselectNode(topNode.menuSelectedEntry);
UI/WebServerResources/generic.js
+2 -2
View File
@@ -137,10 +137,10 @@ function extractEmailName(mailTo) {
function sanitizeMailTo(dirtyMailTo) {
var emailName = extractEmailName(dirtyMailTo);
var email = extractEmailAddress(dirtyMailTo);
var email = "" + extractEmailAddress(dirtyMailTo);
var mailto = "";
if (emailName.length > 0)
if (emailName && emailName.length > 0)
mailto = emailName + ' <' + email + '>';
else
mailto = email;