amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-07 01:15:09 +00:00
Code Issues Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo.1_3_12' (head 2b438d60e3231cf7f4811dadaf9a91a62885d15b)

Browse Source 
to branch 'ca.inverse.sogo' (head 2a5d61f1ed60b9d00203fc41d7b5af818e00391f)

Monotone-Parent: 2a5d61f1ed60b9d00203fc41d7b5af818e00391f
Monotone-Parent: 2b438d60e3231cf7f4811dadaf9a91a62885d15b
Monotone-Revision: 96f11391475b0d4e71002f19f89309839d039b36

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-07T14:12:46
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2012-02-07 14:12:46 +00:00
parent b27f0de9a9 1c77687067
commit a79036fbf9
65 changed files with 883 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/UIxAttendeesEditor.js
+8 -2
View File
@@ -219,7 +219,10 @@ function performSearchCallback(http) {
list.appendChild(node);
node.address = completeEmail;
// log("node.address: " + node.address);
node.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"];
if (contact["c_uid"])
node.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"];
else
node.uid = null;
node.isList = isList;
if (isList) {
node.cname = contact["c_name"];
@@ -272,7 +275,10 @@ function performSearchCallback(http) {
if (data.contacts.length == 1) {
// Single result
var contact = data.contacts[0];
input.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"];
if (contact["c_uid"])
input.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"];
else
input.uid = null;
var isList = (contact["c_component"] &&
contact["c_component"] == "vlist");
if (isList) {
UI/WebServerResources/UIxMailEditor.js
+2 -7
View File
@@ -424,7 +424,7 @@ function initMailEditor() {
'BulletedList', '-', 'Link', 'Unlink', 'Image',
'JustifyLeft','JustifyCenter','JustifyRight',
'JustifyBlock','Font','FontSize','-','TextColor',
'BGColor','-','SpellChecker']
'BGColor','-','SpellChecker','Scayt']
],
language : localeCode,
scayt_sLang : localeCode
@@ -513,12 +513,7 @@ function onRemoveAttachments() {
list.removeChild(nodes[i]);
}
else {
var filename = "";
var childNodes = nodes[i].childNodes;
for (var j = 0; j < childNodes.length; j++) {
if (childNodes[j].nodeType == 3)
filename += childNodes[j].nodeValue;
}
var filename = nodes[i].title;
var url = "" + window.location;
var parts = url.split("/");
parts[parts.length-1] = "deleteAttachment?filename=" + encodeURIComponent(filename);