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

merge of 'a00b81f79363503679ee8113681198eb8b5de97e'

Browse Source 
and 'eb759cedcd41f4bc822816acd58b93115f94f266'

Monotone-Parent: a00b81f79363503679ee8113681198eb8b5de97e
Monotone-Parent: eb759cedcd41f4bc822816acd58b93115f94f266
Monotone-Revision: d205cf705c1c42fd1d48092e23c41087cdfce10a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-07T17:46:18
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-07-07 17:46:18 +00:00
parent b4c44e9351 463752df0d
commit 3b94160f38
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+11
View File
@@ -1,3 +1,14 @@
2009-07-07 Cyril Robert <crobert@inverse.ca>
* UI/WebServerResources/MailerUI.js: Fixed Drag&Drop issue (header was
draggable)
* UI/WebServerResources/ContactsUI.js: Fixed Drag&Drop issue (header was
draggable)
* UI/WebServerResources/MailerUI.js: Revert
* UI/WebServerResources/ContactsUI.js: Revert
* UI/WebServerResources/MailerUI.js: Fixed Mantis #45
* UI/WebServerResources/ContactsUI.js: Fixed Mantis #45
2009-07-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Scheduler/UIxCalListingActions.m (-eventsBlocksAction): added
UI/Templates/ContactsUI/UIxContactsListView.wox
+1 -1
View File
@@ -23,7 +23,7 @@
><var:string label:value="Preferred Phone" /></td
></tr>
</thead>
<tbody>
<tbody id="contactsListTbody">
<var:foreach list="contactInfos" item="currentContact">
<tr class="tableview"
var:id="currentContact.c_name"
UI/WebServerResources/ContactsUI.js
+6 -1
View File
@@ -106,8 +106,8 @@ function contactsListCallback(http) {
table.observe("mousedown", onContactSelectionChange);
configureSortableTableHeaders(table);
TableKit.Resizable.init(table, {'trueResize' : true, 'keepWidth' : true});
configureDragAndDrop ();
}
configureDragAndDrop ();
var rows = table.tBodies[0].rows;
for (var i = 0; i < rows.length; i++) {
@@ -1147,6 +1147,11 @@ function dropAction (dropped, zone, e) {
if ($("dragDropVisual").hasClassName ("copy"))
action = "copy";
dropSelectedContacts (action, zone.id.substr (1));
if (action != "copy") {
var div = $('contactView');
div.innerHTML = "";
}
}
function dropSelectedContacts (action, toId) {
UI/WebServerResources/MailerUI.js
+9 -3
View File
@@ -2292,10 +2292,15 @@ function dropAction (dropped, zone, e) {
if ($("dragDropVisual").hasClassName ("copy"))
action = "copy";
dropSelectedContacts (action, destination);
dropSelectedMessages (action, destination);
if (action != "copy") {
var div = $('messageContent');
div.innerHTML = "";
}
}
function dropSelectedContacts (action, targetMailbox) {
function dropSelectedMessages (action, targetMailbox) {
var messageList = $("messageList").down("TBODY");
var rows = messageList.getSelectedNodes();
var uids = new Array(); // message IDs
@@ -2304,7 +2309,8 @@ function dropSelectedContacts (action, targetMailbox) {
for (var i = 0; i < rows.length; i++) {
var uid = rows[i].readAttribute("id").substr(4);
var path = Mailer.currentMailbox + "/" + uid;
rows[i].hide();
if (action != "copy")
rows[i].hide();
uids.push(uid);
paths.push(path);
}