Monotone-Parent: 37ceea55166e4e5489fd66be14e66b1dc1635432

Monotone-Revision: 23d43e89ea5144597dd91682802c352295f3a8f5

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-22T14:54:46
Monotone-Branch: ca.inverse.sogo

UI/Templates/ContactsUI/UIxContactsFilterPanel.wox

@@ -7,9 +7,8 @@
     >
     <div class="menu" id="searchMenu">
       <ul id="searchOptions">
-        <li id="name_or_address"
+        <li id="name_or_address"><var:string
-          onmousedown="return false;"
+	    label:value="Name or Email"/></li>
-          onmouseup="setSearchCriteria(event);"><var:string label:value="Name or Email"/></li>
       </ul>
     </div>
 

UI/Templates/ContactsUI/UIxContactsListViewContainer.wox

@@ -14,23 +14,23 @@
     <div class="menu" id="contactFoldersMenu">
       <ul>
 	<li><var:string label:value="Modify" /></li>
-	<li id="accessRightsMenuEntry"><var:string label:value="Sharing..." /></li>
+	<li><var:string label:value="Sharing..." /></li>
-	<li class="separator"></li>
+	<li><!-- separator --></li>
-	<li class="disabled"><var:string label:value="New Card" /></li>
+	<li><var:string label:value="New Card" /></li>
-	<li class="disabled"><var:string label:value="New List" /></li>
+	<li><var:string label:value="New List" /></li>
-	<li class="separator"></li>
+	<li><!-- separator --></li>
-	<li class="disabled"><var:string label:value="Delete" /></li>
+	<li><var:string label:value="Delete" /></li>
       </ul>
     </div>
 
     <div class="menu" id="contactMenu">
       <ul>
-	<li id="modifyContactMenuEntry" onmouseup="return onMenuEditContact(event, this);"><var:string label:value="Modify" /></li>
+	<li><var:string label:value="Modify" /></li>
-	<li class="separator"></li>
+	<li><!-- separator --></li>
-	<li id="writeToContactMenuEntry" onmouseup="return onMenuWriteToContact(event, this);"><var:string label:value="Write" /></li>
+	<li><var:string label:value="Write" /></li>
-	<li class="disabled" id="imContactMenuEntry"><var:string label:value="Instant Message" /></li>
+	<li><var:string label:value="Instant Message" /></li>
-	<li class="separator"></li>
+	<li><!-- separator --></li>
-	<li id="deleteContactMenuEntry" onmouseup="return onMenuDeleteContact(event, this);"><var:string label:value="Delete" /></li>
+	<li><var:string label:value="Delete" /></li>
       </ul>
     </div>
 

UI/WebServerResources/ContactsUI.js

@@ -91,7 +91,7 @@ function contactsListCallback(http) {
 function onContactFoldersContextMenu(event) {
   var menu = $("contactFoldersMenu");
   menu.addEventListener("hideMenu", onContactFoldersContextMenuHide, false);
-  onMenuClick(event, "contactFoldersMenu");
+  popupMenu(event, "contactFoldersMenu", this);
 
   var topNode = $("contactFolders");
   var selectedNodes = topNode.getSelectedRows();
@@ -105,7 +105,7 @@ function onContactFoldersContextMenu(event) {
 function onContactContextMenu(event, element) {
   var menu = $("contactMenu");
   menu.addEventListener("hideMenu", onContactContextMenuHide, false);
-  onMenuClick(event, "contactMenu");
+  popupMenu(event, "contactMenu", element);
 
   var topNode = $("contactsList");
   var selectedNodes = topNode.getSelectedRows();
@@ -235,31 +235,23 @@ function onContactRowDblClick(event, node) {
   return false;
 }
 
-function onMenuEditContact(event, node) {
+function onMenuEditContact(event) {
-  var node = getParentMenu(node).menuTarget.parentNode;
+  var contactId = document.menuTarget.getAttribute('id');
-  var contactId = node.getAttribute('id');
 
   openContactWindow(null,
                     URLForFolderID(currentContactFolder)
                     + "/" + contactId + "/edit");
-
-  return false;
 }
 
-function onMenuWriteToContact(event, node) {
+function onMenuWriteToContact(event) {
-  var node = getParentMenu(node).menuTarget.parentNode;
+   var contactId = document.menuTarget.getAttribute('id');
-  var contactId = node.getAttribute('id');
 
-  openMailComposeWindow(ApplicationBaseURL + currentContactFolder
+   openMailComposeWindow(ApplicationBaseURL + currentContactFolder
-                        + "/" + contactId + "/write");
+			 + "/" + contactId + "/write");
-
-  return false;
 }
 
-function onMenuDeleteContact(event, node) {
+function onMenuDeleteContact(event) {
-  uixDeleteSelectedContacts(node);
+  uixDeleteSelectedContacts(this);
-
-  return false;
 }
 
 function onToolbarEditSelectedContacts(event) {
@@ -621,11 +613,16 @@ function onMenuSharing(event) {
 }
 
 function initializeMenus() {
-//   var menus = new Array("contactFoldersMenu", "contactMenu", "searchMenu");
+   menus["menuIds"] = new Array("contactFoldersMenu", "contactMenu",
-//   initMenusNamed(menus);
+				"searchMenu");
+   menus["contactFoldersMenu"] = new Array(null, onMenuSharing, "-", null,
+					   null, "-", null);
+   menus["contactMenu"] = new Array(onMenuEditContact, "-",
+				    onMenuWriteToContact, null, "-",
+				    onMenuDeleteContact);
+   menus["searchMenu"] = new Array(setSearchCriteria);
 
-//   var menuEntry = $("accessRightsMenuEntry");
+   initMenus();
-//   menuEntry.addEventListener("mouseup", onMenuSharing, false);
 }
 
 function configureSearchField() {

UI/WebServerResources/generic.js

@@ -685,9 +685,8 @@ function setSearchCriteria(event) {
   searchValue = $("searchValue");
   searchCriteria = $("searchCriteria");
 
-  var node = event.target;
+  searchValue.setAttribute("ghost-phrase", this.innerHTML);
-  searchValue.setAttribute("ghost-phrase", node.innerHTML);
+//   searchCriteria = this.getAttribute('id');
-  searchCriteria = node.getAttribute('id');
 }
 
 function checkSearchValue(event) {