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

propagate from branch 'ca.inverse.sogo.1_3_15' (head 908e524c769a51dae0dcb912328a3f394bff90c0) 

to branch 'ca.inverse.sogo' (head 60ad1ae0d352bd61f6595c24b454acb729bdaadf)

Monotone-Parent: 60ad1ae0d352bd61f6595c24b454acb729bdaadf
Monotone-Parent: 908e524c769a51dae0dcb912328a3f394bff90c0
Monotone-Revision: 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T19:04:17
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2012-05-14 19:04:17 +00:00
parent f5ea18a605 782709f0a7
commit 88065426fe
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2012-05-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/generic.js (subscribeToFolder): prepend a
"/" to the folder name, as it comes originally in the form
user:module/folder.
* UI/WebServerResources/UIxPreferences.js (initMailAccounts)
(displayMailAccount): getElementsByTagName seems too standard for
IE, we use $$() now so that we can invoke "each" on the result set

8
UI/WebServerResources/generic.js
View File

@ -1211,7 +1211,7 @@ function subscribeToFolder(refreshCallback, refreshCallbackData) {
var folderPath = folderData[1];
if (username != UserLogin) {
var url = (UserFolderURL + "../" + username
+ folderPath + "/subscribe");
+ "/" + folderPath + "/subscribe");
if (document.subscriptionAjaxRequest) {
document.subscriptionAjaxRequest.aborted = true;
document.subscriptionAjaxRequest.abort();
@ -1266,10 +1266,10 @@ function accessToSubscribedFolder(serverFolder) {
var username = parts[0];
var paths = parts[1].split("/");
if (username == UserLogin) {
folder = paths[2];
folder = paths[1];
}
else {
folder = "/" + username.asCSSIdentifier() + "_" + paths[2];
folder = "/" + username.asCSSIdentifier() + "_" + paths[1];
}
}
else {
@ -2047,7 +2047,7 @@ function _showPromptDialog(title, label, callback, defaultValue) {
document.body.appendChild(dialog);
dialogs[title+label] = dialog;
}
jQuery(dialog).fadeIn('fast', function () { dialog.down("input").focus(); });
jQuery(dialog).fadeIn('fast', function () { dialog.down("input").focus(); });
}
function showSelectDialog(title, label, options, button, callbackFcn, callbackArg, defaultValue) {