From ed52a355b3cb16c0ffa30e4181386277abf76195 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 01 Jul 2013 07:51:03 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
plugins/archive/archive.js | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
index eee41d3..3500b9f 100644
--- a/plugins/archive/archive.js
+++ b/plugins/archive/archive.js
@@ -7,18 +7,16 @@
{
if (!rcmail.env.uid && (!rcmail.message_list || !rcmail.message_list.get_selection().length))
return;
-
+
if (rcmail.env.mailbox.indexOf(rcmail.env.archive_folder) != 0) {
if (!rcmail.env.archive_type) {
// simply move to archive folder (if no partition type is set)
- rcmail.command('moveto', rcmail.env.archive_folder);
+ rcmail.command('move', rcmail.env.archive_folder);
}
else {
// let the server sort the messages to the according subfolders
- rcmail.http_post(
- 'plugin.move2archive',
- { _uid: rcmail.message_list.get_selection().join(','), _mbox: rcmail.env.mailbox }
- );
+ var post_data = { _uid: rcmail.message_list.get_selection().join(','), _mbox: rcmail.env.mailbox };
+ rcmail.http_post('plugin.move2archive', post_data);
}
}
}
@@ -26,16 +24,15 @@
// callback for app-onload event
if (window.rcmail) {
rcmail.addEventListener('init', function(evt) {
-
// register command (directly enable in message view mode)
rcmail.register_command('plugin.archive', rcmail_archive, (rcmail.env.uid && rcmail.env.mailbox != rcmail.env.archive_folder));
-
+
// add event-listener to message list
if (rcmail.message_list)
- rcmail.message_list.addEventListener('select', function(list){
+ rcmail.message_list.addEventListener('select', function(list) {
rcmail.enable_command('plugin.archive', (list.get_selection().length > 0 && rcmail.env.mailbox != rcmail.env.archive_folder));
});
-
+
// set css style for archive folder
var li;
if (rcmail.env.archive_folder && (li = rcmail.get_folder_li(rcmail.env.archive_folder, '', true)))
@@ -48,4 +45,3 @@
});
})
}
-
--
Gitblit v1.9.1