diff options
author | Aleksander Machniak <alec@alec.pl> | 2013-07-01 13:51:03 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2013-07-01 13:51:03 +0200 |
commit | ed52a355b3cb16c0ffa30e4181386277abf76195 (patch) | |
tree | ba61550c7b1db6aabee4fa5aff0fbcc2d9649a8d /plugins | |
parent | a3f745bcccbb9e89ece7a1506a83215688008d3c (diff) | |
parent | 3e3f39a06c6fe32aaa5ba84baba0f61f41ef870d (diff) |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins')
-rw-r--r-- | 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 eee41d336..3500b9fe4 100644 --- a/plugins/archive/archive.js +++ b/plugins/archive/archive.js @@ -7,18 +7,16 @@ function rcmail_archive(prop) { 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 @@ function rcmail_archive(prop) // 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 @@ if (window.rcmail) { }); }) } - |