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

merge of '2e1565da869405c503b47261079abdaf1bcbe0dc'

Browse Source 
and '5aa79fd0d4ac848647377f824a2f1a004888b1d4'

Monotone-Parent: 2e1565da869405c503b47261079abdaf1bcbe0dc
Monotone-Parent: 5aa79fd0d4ac848647377f824a2f1a004888b1d4
Monotone-Revision: 87feef5f6b5a134ba084a5136940995c74246765

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-05-04T19:53:23
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-05-04 19:53:23 +00:00
parent 2c43125079 3ff779a8e8
commit fd5f9fd476
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2010-05-04 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/ContactsUI.js (initContacts): we must
configure the ab toolbar even when in popup mode.
2010-05-04 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Contacts/SOGoContactSourceFolder.m

20
UI/WebServerResources/ContactsUI.js
View File

@@ -1180,17 +1180,17 @@ function onDocumentKeydown(event) {
function initContacts(event) {
if ($(document.body).hasClassName("popup")) {
configureSelectionButtons();
} else {
configureAbToolbar();
var tabsContainer = $("smallToolbarContainer");
var controller = new SOGoTabsController();
controller.attachToTabsContainer(tabsContainer);
// Addressbook import form
$("uploadCancel").observe("click", hideContactsImport);
$("uploadOK").observe("click", hideImportResults);
}
var controller = new SOGoTabsController();
var tabsContainer = $("smallToolbarContainer");
controller.attachToTabsContainer(tabsContainer);
configureAbToolbar();
// Addressbook import form
$("uploadCancel").observe("click", hideContactsImport);
$("uploadOK").observe("click", hideImportResults);
if (Prototype.Browser.Gecko)
Event.observe(document, "keypress", onDocumentKeydown); // for FF2
else