From fb7ec576ab3a353b6eb99614e9636a9096462807 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Thu, 25 Mar 2010 12:29:02 -0400 Subject: [PATCH] - Added possibility to select all messages in a folder (#1484756) --- program/js/app.js | 198 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 133 insertions(+), 65 deletions(-) diff --git a/program/js/app.js b/program/js/app.js index 87ee76c..0fc5e76 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -197,7 +197,7 @@ if (this.env.action=='show' || this.env.action=='preview') { - this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', + this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download', 'print', 'load-attachment', 'load-headers', true); if (this.env.next_uid) @@ -358,7 +358,6 @@ this.sections_list.addEventListener('select', function(o){ p.section_select(o); }); this.sections_list.init(); this.sections_list.focus(); - this.sections_list.select_first(); } else if (this.gui_objects.subscriptionlist) this.init_subscription_list(); @@ -490,8 +489,8 @@ case 'menu-open': case 'menu-save': - this.triggerEvent(command, {props:props}); - return false; + this.triggerEvent(command, {props:props}); + return false; break; case 'open': @@ -674,6 +673,11 @@ this.copy_contact(null, props); break; + case 'copy': + if (this.task == 'mail') + this.copy_messages(props); + break; + case 'mark': if (props) this.mark_message(props); @@ -749,10 +753,11 @@ break; case 'select-all': + this.select_all_mode = props ? false : true; if (props == 'invert') this.message_list.invert_selection(); else - this.message_list.select_all(props); + this.message_list.select_all(props == 'page' ? '' : props); break; case 'select-none': @@ -1194,10 +1199,14 @@ // handle mouse release when dragging if (this.drag_active && model && this.env.last_folder_target) { + var mbox = model[this.env.last_folder_target].id; + $(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget'); - this.command('moveto', model[this.env.last_folder_target].id); this.env.last_folder_target = null; list.draglayer.hide(); + + if (!this.drag_menu(e, mbox)) + this.command('moveto', mbox); } // reset 'pressed' buttons @@ -1207,6 +1216,29 @@ this.button_out(this.buttons_sel[id], id); this.buttons_sel = {}; } + }; + + this.drag_menu = function(e, mbox) + { + var modkey = rcube_event.get_modifier(e); + var menu = $('#'+this.gui_objects.message_dragmenu); + + if (menu && modkey == SHIFT_KEY) { + var pos = rcube_event.get_mouse_pos(e); + this.env.drag_mbox = mbox; + menu.css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'}).show(); + return true; + } + }; + + this.drag_menu_action = function(action) + { + var menu = $('#'+this.gui_objects.message_dragmenu); + if (menu) { + menu.hide(); + } + this.command(action, this.env.drag_mbox); + this.env.drag_mbox = null; }; this.drag_start = function(list) @@ -1389,12 +1421,12 @@ { this.enable_command('reply', 'reply-all', 'forward', false); this.enable_command('show', 'print', 'open', 'edit', 'download', 'viewsource', selected); - this.enable_command('delete', 'moveto', 'mark', (list.selection.length > 0 ? true : false)); + this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false)); } else { this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', 'edit', 'open', 'download', 'viewsource', selected); - this.enable_command('delete', 'moveto', 'mark', (list.selection.length > 0 ? true : false)); + this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false)); } // start timer for message preview (wait for double click) @@ -1496,14 +1528,14 @@ var tbody = this.message_list.background; else var tbody = this.gui_objects.messagelist.tBodies[0]; - + var rows = this.message_list.rows; var rowcount = tbody.rows.length; var even = rowcount%2; - + if (!this.env.messages[uid]) this.env.messages[uid] = {}; - + // merge flags over local message object $.extend(this.env.messages[uid], { deleted: flags.deleted?1:0, @@ -1524,35 +1556,33 @@ + (flags.unread ? ' unread' : '') + (flags.deleted ? ' deleted' : '') + (flags.flagged ? ' flagged' : '') - + (flags.unread_children && !flags.unread ? ' unroot' : '') + + (flags.unread_children && !flags.unread && !this.env.autoexpand_threads ? ' unroot' : '') + (this.message_list.in_selection(uid) ? ' selected' : ''); // for performance use DOM instead of jQuery here var row = document.createElement('tr'); row.id = 'rcmrow'+uid; row.className = css_class; - + var icon = this.env.messageicon; if (!flags.unread && flags.unread_children > 0 && this.env.unreadchildrenicon) icon = this.env.unreadchildrenicon; else if (flags.deleted && this.env.deletedicon) icon = this.env.deletedicon; - else if (flags.replied && this.env.repliedicon) - { + else if (flags.replied && this.env.repliedicon) { if (flags.forwarded && this.env.forwardedrepliedicon) icon = this.env.forwardedrepliedicon; else icon = this.env.repliedicon; - } + } else if (flags.forwarded && this.env.forwardedicon) icon = this.env.forwardedicon; else if(flags.unread && this.env.unreadicon) icon = this.env.unreadicon; - + var tree = expando = ''; - if (this.env.threading) - { + if (this.env.threading) { // This assumes that div width is hardcoded to 15px, var width = message.depth * 15; if (message.depth) { @@ -1563,7 +1593,7 @@ } else message.expanded = true; - } + } else if (message.has_children) { if (typeof(message.expanded) == 'undefined' && (this.env.autoexpand_threads == 1 || (this.env.autoexpand_threads == 2 && message.unread_children))) { message.expanded = true; @@ -1575,7 +1605,7 @@ if (message.has_children && !message.depth) expando = '<div id="rcmexpando' + uid + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '"> </div>'; - } + } tree += icon ? '<img id="msgicn'+uid+'" src="'+icon+'" alt="" class="msgicon" />' : ''; @@ -1804,9 +1834,10 @@ // unselect selected messages this.last_selected = 0; - if (this.message_list) + if (this.message_list) { this.message_list.clear_selection(); - + this.select_all_mode = false; + } this.select_folder(mbox, this.env.mailbox); this.env.mailbox = mbox; @@ -2121,6 +2152,32 @@ $(row.obj).removeClass('unroot'); }; + // copy selected messages to the specified mailbox + this.copy_messages = function(mbox) + { + // exit if current or no mailbox specified or if selection is empty + if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length))) + return; + + var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : ''); + var a_uids = new Array(); + + if (this.env.uid) + a_uids[0] = this.env.uid; + else + { + var selection = this.message_list.get_selection(); + var id; + for (var n=0; n<selection.length; n++) { + id = selection[n]; + a_uids[a_uids.length] = id; + } + } + + // send request to server + this.http_post('copy', '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, false); + }; + // move selected messages to the specified mailbox this.move_messages = function(mbox) { @@ -2148,32 +2205,38 @@ // delete selected messages from the current mailbox this.delete_messages = function() - { - var selection = this.message_list ? this.message_list.get_selection() : new Array(); + { + var selection = this.message_list ? $.merge([], this.message_list.get_selection()) : new Array(); // exit if no mailbox specified or if selection is empty if (!this.env.uid && !selection.length) return; - + + // also select childs of collapsed rows + for (var uid, i=0; i < selection.length; i++) { + uid = selection[i]; + if (this.message_list.rows[uid].has_children && !this.message_list.rows[uid].expanded) + this.message_list.select_childs(uid); + } + // if config is set to flag for deletion if (this.env.flag_for_deletion) { this.mark_message('delete'); return false; - } + } // if there isn't a defined trash mailbox or we are in it else if (!this.env.trash_mailbox || this.env.mailbox == this.env.trash_mailbox) this.permanently_remove_messages(); // if there is a trash mailbox defined and we're not currently in it else { // if shift was pressed delete it immediately - if (this.message_list && this.message_list.shiftkey) - { + if (this.message_list && this.message_list.shiftkey) { if (confirm(this.get_label('deletemessagesconfirm'))) this.permanently_remove_messages(); - } + } else this.move_messages(this.env.trash_mailbox); - } + } return true; }; @@ -2193,8 +2256,8 @@ // @private this._with_selected_messages = function(action, lock, add_url) { - var a_uids = new Array(); - var count = 0; + var a_uids = new Array(), + count = 0; if (this.env.uid) a_uids[0] = this.env.uid; @@ -2205,7 +2268,7 @@ for (var n=0; n<selection.length; n++) { id = selection[n]; a_uids[a_uids.length] = id; - count += this.update_thread(id); + count += this.update_thread(id); this.message_list.remove_row(id, (this.env.display_next && n == selection.length-1)); } // make sure there are no selected rows @@ -2226,8 +2289,10 @@ // remove threads from the end of the list this.delete_excessive_thread_rows(); + add_url += '&_uid='+this.uids_to_list(a_uids); + // send request to server - this.http_post(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock); + this.http_post(action, '_mbox='+urlencode(this.env.mailbox)+add_url, lock); }; // set a specific flag to one or more messages @@ -2294,7 +2359,7 @@ for (var i=0; i<a_uids.length; i++) this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false)); - this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag); + this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag); for (var i=0; i<a_uids.length; i++) this.update_thread_root(a_uids[i], flag); @@ -2307,7 +2372,7 @@ for (var i=0; i<a_uids.length; i++) this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false)); - this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag); + this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag); }; // mark all message rows as deleted/undeleted @@ -2351,49 +2416,48 @@ for (var i=0; i<a_uids.length; i++) this.set_message(a_uids[i], 'deleted', false); - this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=undelete'); + this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete'); return true; }; this.flag_as_deleted = function(a_uids) { - var add_url = ''; - var r_uids = new Array(); - var rows = this.message_list ? this.message_list.rows : new Array(); - var count = 0; + var add_url = '', + r_uids = new Array(), + rows = this.message_list ? this.message_list.rows : new Array(), + count = 0; - for (var i=0; i<a_uids.length; i++) - { + for (var i=0; i<a_uids.length; i++) { uid = a_uids[i]; - if (rows[uid]) - { + if (rows[uid]) { if (rows[uid].unread) r_uids[r_uids.length] = uid; - if (this.env.skip_deleted) { - count += this.update_thread(uid); + if (this.env.skip_deleted) { + count += this.update_thread(uid); this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1)); - } - else - this.set_message(uid, 'deleted', true); - } + } + else + this.set_message(uid, 'deleted', true); } + } // make sure there are no selected rows if (this.env.skip_deleted && this.message_list) { if(!this.env.display_next) - this.message_list.clear_selection(); + this.message_list.clear_selection(); if (count < 0) add_url += '&_count='+(count*-1); else if (count > 0) // remove threads from the end of the list this.delete_excessive_thread_rows(); - } + } add_url = '&_from='+(this.env.action ? this.env.action : ''); + // ?? if (r_uids.length) - add_url += '&_ruid='+r_uids.join(','); + add_url += '&_ruid='+this.uids_to_list(r_uids); if (this.env.skip_deleted) { // also send search request to get the right messages @@ -2403,7 +2467,7 @@ add_url += '&_next_uid='+this.env.next_uid; } - this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete'+add_url); + this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=delete'+add_url); return true; }; @@ -2411,21 +2475,25 @@ // argument should be a coma-separated list of uids this.flag_deleted_as_read = function(uids) { - var icn_src; - var rows = this.message_list ? this.message_list.rows : new Array(); - var str = String(uids); - var a_uids = new Array(); + var icn_src, uid, + rows = this.message_list ? this.message_list.rows : new Array(), + str = String(uids), + a_uids = str.split(','); - a_uids = str.split(','); - - for (var uid, i=0; i<a_uids.length; i++) - { + for (var i=0; i<a_uids.length; i++) { uid = a_uids[i]; if (rows[uid]) this.set_message(uid, 'unread', false); } }; + // Converts array of message UIDs to comma-separated list for use in URL + // with select_all mode checking + this.uids_to_list = function(uids) + { + return this.select_all_mode ? '*' : uids.join(','); + }; + /*********************************************************/ /********* mailbox folders methods *********/ @@ -4625,7 +4693,7 @@ if (this.env.contentframe) this.show_contentframe(false); // disable commands useless when mailbox is empty - this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', + this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'copy', 'delete', 'mark', 'viewsource', 'open', 'edit', 'download', 'print', 'load-attachment', 'purge', 'expunge', 'select-all', 'select-none', 'sort', 'expand-all', 'expand-unread', 'collapse-all', false); -- Gitblit v1.9.1