Monotone-Parent: ffa02d814d2b95752685c44776cbbb2b26be4b47

Monotone-Revision: cef5766f36be67ad2c832de6c30036169a70cff5

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-09-09T19:01:38
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2008-09-09 19:01:38 +00:00
parent 7bc8c818e9
commit 103c5fad9b
2 changed files with 8 additions and 18 deletions

View file

@ -547,30 +547,18 @@ function onConfirmContactSelection(event) {
var currentAddressBookName = folderLi.innerHTML; var currentAddressBookName = folderLi.innerHTML;
var selectorList = null; var selectorList = null;
var initialValues = null; var initialValues = null;
if (selector) {
var selectorId = selector.getAttribute("id");
selectorList = opener.window.document.getElementById('uixselector-'
+ selectorId
+ '-uidList');
initialValues = selectorList.value;
}
var contactsList = $("contactsList"); var contactsList = $("contactsList");
var rows = contactsList.getSelectedRows(); var rows = contactsList.getSelectedRows();
for (i = 0; i < rows.length; i++) { for (i = 0; i < rows.length; i++) {
var cid = rows[i].getAttribute("contactid"); var cid = rows[i].getAttribute("contactid");
var cname = '' + rows[i].getAttribute("contactname"); var cname = '' + rows[i].getAttribute("contactname");
var email = '' + rows[i].cells[1].innerHTML; var email = '' + rows[i].cells[1].innerHTML;
window.opener.addContact(tag, currentAddressBookName + '/' + cname, window.opener.addContact(tag, currentAddressBookName + '/' + cname,
cid, cname, email); cid, cname, email);
} }
if (selector && selector.changeNotification
&& selectorList.value != initialValues)
selector.changeNotification("addition");
preventDefault(event); preventDefault(event);
} }
@ -993,7 +981,7 @@ function getMenus() {
function configureSelectionButtons() { function configureSelectionButtons() {
var container = $("contactSelectionButtons"); var container = $("contactSelectionButtons");
if (container) { if (container) {
var buttons = container.childNodesWithTag("input"); var buttons = container.select("input");
for (var i = 0; i < buttons.length; i++) for (var i = 0; i < buttons.length; i++)
$(buttons[i]).observe("click", onConfirmContactSelection); $(buttons[i]).observe("click", onConfirmContactSelection);
} }

View file

@ -141,9 +141,11 @@ var SOGoDragHandlesInterface = {
} }
}, },
saveDragHandleState: function (type, position) { saveDragHandleState: function (type, position) {
var urlstr = ApplicationBaseURL + "saveDragHandleState" if (!$(document.body).hasClassName("popup")) {
+ "?" + type + "=" + position; var urlstr = ApplicationBaseURL + "saveDragHandleState"
triggerAjaxRequest(urlstr, this.saveDragHandleStateCallback); + "?" + type + "=" + position;
triggerAjaxRequest(urlstr, this.saveDragHandleStateCallback);
}
}, },
saveDragHandleStateCallback: function (http) { saveDragHandleStateCallback: function (http) {