From 10abf2bc2d08526ad69c6e8691b0a3384603fcc1 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Mon, 03 Feb 2014 06:13:25 -0500 Subject: [PATCH] Fix bug where it wasn't possible to focus the messages list with mouse click on a record after the focus was put on preview frame. --- program/js/app.js | 380 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 262 insertions(+), 118 deletions(-) diff --git a/program/js/app.js b/program/js/app.js index 398417a..540abf1 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -198,22 +198,23 @@ multiselect:true, multiexpand:true, draggable:true, keyboard:true, column_movable:this.env.col_movable, dblclick_time:this.dblclick_time }); - this.message_list.row_init = function(o){ p.init_message_row(o); }; - this.message_list.addEventListener('dblclick', function(o){ p.msglist_dbl_click(o); }); - this.message_list.addEventListener('click', function(o){ p.msglist_click(o); }); - this.message_list.addEventListener('keypress', function(o){ p.msglist_keypress(o); }); - this.message_list.addEventListener('select', function(o){ p.msglist_select(o); }); - this.message_list.addEventListener('dragstart', function(o){ p.drag_start(o); }); - this.message_list.addEventListener('dragmove', function(e){ p.drag_move(e); }); - this.message_list.addEventListener('dragend', function(e){ p.drag_end(e); }); - this.message_list.addEventListener('expandcollapse', function(e){ p.msglist_expand(e); }); - this.message_list.addEventListener('column_replace', function(e){ p.msglist_set_coltypes(e); }); - this.message_list.addEventListener('listupdate', function(e){ p.triggerEvent('listupdate', e); }); + this.message_list + .addEventListener('initrow', function(o) { p.init_message_row(o); }) + .addEventListener('dblclick', function(o) { p.msglist_dbl_click(o); }) + .addEventListener('click', function(o) { p.msglist_click(o); }) + .addEventListener('keypress', function(o) { p.msglist_keypress(o); }) + .addEventListener('select', function(o) { p.msglist_select(o); }) + .addEventListener('dragstart', function(o) { p.drag_start(o); }) + .addEventListener('dragmove', function(e) { p.drag_move(e); }) + .addEventListener('dragend', function(e) { p.drag_end(e); }) + .addEventListener('expandcollapse', function(o) { p.msglist_expand(o); }) + .addEventListener('column_replace', function(o) { p.msglist_set_coltypes(o); }) + .addEventListener('listupdate', function(o) { p.triggerEvent('listupdate', o); }) + .init(); document.onmouseup = function(e){ return p.doc_mouse_up(e); }; this.gui_objects.messagelist.parentNode.onmousedown = function(e){ return p.click_on_list(e); }; - this.message_list.init(); this.enable_command('toggle_status', 'toggle_flag', 'sort', true); // load messages @@ -313,9 +314,11 @@ if (this.gui_objects.contactslist) { this.contact_list = new rcube_list_widget(this.gui_objects.contactslist, { multiselect:true, draggable:false, keyboard:false }); - this.contact_list.addEventListener('select', function(o){ ref.compose_recipient_select(o); }); - this.contact_list.addEventListener('dblclick', function(o){ ref.compose_add_recipient('to'); }); - this.contact_list.init(); + this.contact_list + .addEventListener('initrow', function(o) { p.triggerEvent('insertrow', { cid:o.uid, row:o }); }) + .addEventListener('select', function(o) { ref.compose_recipient_select(o); }) + .addEventListener('dblclick', function(o) { ref.compose_add_recipient('to'); }) + .init(); } if (this.gui_objects.addressbookslist) { @@ -352,13 +355,14 @@ if (this.gui_objects.contactslist) { this.contact_list = new rcube_list_widget(this.gui_objects.contactslist, {multiselect:true, draggable:this.gui_objects.folderlist?true:false, keyboard:true}); - this.contact_list.row_init = function(row){ p.triggerEvent('insertrow', { cid:row.uid, row:row }); }; - this.contact_list.addEventListener('keypress', function(o){ p.contactlist_keypress(o); }); - this.contact_list.addEventListener('select', function(o){ p.contactlist_select(o); }); - this.contact_list.addEventListener('dragstart', function(o){ p.drag_start(o); }); - this.contact_list.addEventListener('dragmove', function(e){ p.drag_move(e); }); - this.contact_list.addEventListener('dragend', function(e){ p.drag_end(e); }); - this.contact_list.init(); + this.contact_list + .addEventListener('initrow', function(o) { p.triggerEvent('insertrow', { cid:o.uid, row:o }); }) + .addEventListener('keypress', function(o) { p.contactlist_keypress(o); }) + .addEventListener('select', function(o) { p.contactlist_select(o); }) + .addEventListener('dragstart', function(o) { p.drag_start(o); }) + .addEventListener('dragmove', function(e) { p.drag_move(e); }) + .addEventListener('dragend', function(e) { p.drag_end(e); }) + .init(); if (this.env.cid) this.contact_list.highlight_row(this.env.cid); @@ -415,35 +419,39 @@ } if (this.gui_objects.identitieslist) { - this.identity_list = new rcube_list_widget(this.gui_objects.identitieslist, {multiselect:false, draggable:false, keyboard:false}); - this.identity_list.addEventListener('select', function(o){ p.identity_select(o); }); - this.identity_list.init(); - this.identity_list.focus(); + this.identity_list = new rcube_list_widget(this.gui_objects.identitieslist, + {multiselect:false, draggable:false, keyboard:false}); + this.identity_list + .addEventListener('select', function(o) { p.identity_select(o); }) + .init() + .focus(); if (this.env.iid) this.identity_list.highlight_row(this.env.iid); } else if (this.gui_objects.sectionslist) { this.sections_list = new rcube_list_widget(this.gui_objects.sectionslist, {multiselect:false, draggable:false, keyboard:false}); - this.sections_list.addEventListener('select', function(o){ p.section_select(o); }); - this.sections_list.init(); - this.sections_list.focus(); + this.sections_list + .addEventListener('select', function(o) { p.section_select(o); }) + .init() + .focus(); } else if (this.gui_objects.subscriptionlist) { this.init_subscription_list(); } else if (this.gui_objects.responseslist) { this.responses_list = new rcube_list_widget(this.gui_objects.responseslist, {multiselect:false, draggable:false, keyboard:false}); - this.responses_list.addEventListener('select', function(list) { - var win, id = list.get_single_selection(); - p.enable_command('delete', !!id && $.inArray(id, p.env.readonly_responses) < 0); - if (id && (win = p.get_frame_window(p.env.contentframe))) { - p.set_busy(true); - p.location_href({ _action:'edit-response', _key:id, _framed:1 }, win); - } - }); - this.responses_list.init(); - this.responses_list.focus(); + this.responses_list + .addEventListener('select', function(list) { + var win, id = list.get_single_selection(); + p.enable_command('delete', !!id && $.inArray(id, p.env.readonly_responses) < 0); + if (id && (win = p.get_frame_window(p.env.contentframe))) { + p.set_busy(true); + p.location_href({ _action:'edit-response', _key:id, _framed:1 }, win); + } + }) + .init() + .focus(); } break; @@ -509,11 +517,12 @@ id_prefix: 'rcmli', id_encode: this.html_identifier_encode, id_decode: this.html_identifier_decode, - check_droptarget: function(node){ return !node.virtual && ref.check_droptarget(node.id) } + check_droptarget: function(node) { return !node.virtual && ref.check_droptarget(node.id) } }); - this.treelist.addEventListener('collapse', function(node){ ref.folder_collapsed(node) }); - this.treelist.addEventListener('expand', function(node){ ref.folder_collapsed(node) }); - this.treelist.addEventListener('select', function(node){ ref.triggerEvent('selectfolder', { folder:node.id, prefix:'rcmli' }) }); + this.treelist + .addEventListener('collapse', function(node) { ref.folder_collapsed(node) }) + .addEventListener('expand', function(node) { ref.folder_collapsed(node) }) + .addEventListener('select', function(node) { ref.triggerEvent('selectfolder', { folder:node.id, prefix:'rcmli' }) }); } } @@ -842,14 +851,14 @@ case 'move': case 'moveto': // deprecated if (this.task == 'mail') - this.move_messages(props); + this.move_messages(props, obj); else if (this.task == 'addressbook') this.move_contacts(props); break; case 'copy': if (this.task == 'mail') - this.copy_messages(props); + this.copy_messages(props, obj); else if (this.task == 'addressbook') this.copy_contacts(props); break; @@ -1411,8 +1420,6 @@ this.drag_start = function(list) { - var model = this.task == 'mail' ? this.env.mailboxes : this.env.contactfolders; - this.drag_active = true; if (this.preview_timer) @@ -1427,11 +1434,31 @@ this.drag_end = function(e) { - this.drag_active = false; - this.env.last_folder_target = null; + var list, model; if (this.treelist) this.treelist.drag_end(); + + // execute drag & drop action when mouse was released + if (list = this.message_list) + model = this.env.mailboxes; + else if (list = this.contact_list) + model = this.env.contactfolders; + + if (this.drag_active && model && this.env.last_folder_target) { + var target = model[this.env.last_folder_target]; + list.draglayer.hide(); + + if (this.contact_list) { + if (!this.contacts_drag_menu(e, target)) + this.command('move', target); + } + else if (!this.drag_menu(e, target)) + this.command('move', target); + } + + this.drag_active = false; + this.env.last_folder_target = null; }; this.drag_move = function(e) @@ -1492,37 +1519,15 @@ this.doc_mouse_up = function(e) { - var model, list, id; + var list, id; // ignore event if jquery UI dialog is open if ($(rcube_event.get_target(e)).closest('.ui-dialog, .ui-widget-overlay').length) return; - if (list = this.message_list) - model = this.env.mailboxes; - else if (list = this.contact_list) - model = this.env.contactfolders; - else if (this.ksearch_value) - this.ksearch_blur(); - + list = this.message_list || this.contact_list; if (list && !rcube_mouse_is_over(e, list.list.parentNode)) list.blur(); - - // handle mouse release when dragging - if (this.drag_active && model && this.env.last_folder_target) { - var target = model[this.env.last_folder_target]; - - this.env.last_folder_target = null; - list.draglayer.hide(); - this.drag_end(e); - - if (this.contact_list) { - if (!this.contacts_drag_menu(e, target)) - this.command('move', target); - } - else if (!this.drag_menu(e, target)) - this.command('move', target); - } // reset 'pressed' buttons if (this.buttons_sel) { @@ -2047,7 +2052,6 @@ if (preview && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread && this.env.preview_pane_mark_read >= 0) { this.preview_read_timer = setTimeout(function() { ref.set_message(id, 'unread', false); - ref.update_thread_root(id, 'read'); if (ref.env.unread_counts[ref.env.mailbox]) { ref.env.unread_counts[ref.env.mailbox] -= 1; ref.set_unread_count(ref.env.mailbox, ref.env.unread_counts[ref.env.mailbox], ref.env.mailbox == 'INBOX'); @@ -2553,8 +2557,11 @@ if (!row) return false; - if (flag == 'unread') + if (flag == 'unread') { + if (row.unread != status) + this.update_thread_root(uid, status ? 'unread' : 'read'); row.unread = status; + } else if(flag == 'deleted') row.deleted = status; else if (flag == 'replied') @@ -2612,10 +2619,12 @@ }; // copy selected messages to the specified mailbox - this.copy_messages = function(mbox) + this.copy_messages = function(mbox, obj) { if (mbox && typeof mbox === 'object') mbox = mbox.id; + else if (!mbox) + return this.folder_selector(obj, function(folder) { ref.command('copy', folder); }); // exit if current or no mailbox specified if (!mbox || mbox == this.env.mailbox) @@ -2632,10 +2641,12 @@ }; // move selected messages to the specified mailbox - this.move_messages = function(mbox) + this.move_messages = function(mbox, obj) { if (mbox && typeof mbox === 'object') mbox = mbox.id; + else if (!mbox) + return this.folder_selector(obj, function(folder) { ref.command('move', folder); }); // exit if current or no mailbox specified if (!mbox || mbox == this.env.mailbox) @@ -2662,20 +2673,7 @@ // delete selected messages from the current mailbox this.delete_messages = function(event) { - var uid, i, len, trash = this.env.trash_mailbox, - list = this.message_list, - selection = list ? list.get_selection() : []; - - // exit if no mailbox specified or if selection is empty - if (!this.env.uid && !selection.length) - return; - - // also select childs of collapsed rows - for (i=0, len=selection.length; i<len; i++) { - uid = selection[i]; - if (list.rows[uid].has_children && !list.rows[uid].expanded) - list.select_children(uid); - } + var list = this.message_list, trash = this.env.trash_mailbox; // if config is set to flag for deletion if (this.env.flag_for_deletion) { @@ -2715,7 +2713,7 @@ this._with_selected_messages('delete', post_data); }; - // Send a specifc move/delete request with UIDs of all selected messages + // Send a specific move/delete request with UIDs of all selected messages // @private this._with_selected_messages = function(action, post_data, lock) { @@ -2851,9 +2849,6 @@ this.set_message(a_uids[i], 'unread', (flag == 'unread' ? true : false)); this.http_post('mark', post_data, lock); - - for (i=0; i<len; i++) - this.update_thread_root(a_uids[i], flag); }; // set image to flagged or unflagged @@ -3144,6 +3139,10 @@ if (this.env.draft_id && formdata.draft_id && formdata.draft_id != this.env.draft_id) { continue; } + // skip records on reply + if (this.env.reply_msgid && formdata.reply_msgid != this.env.reply_msgid) { + continue; + } // show dialog asking to restore the message if (formdata.changed && formdata.session != this.env.session_id) { this.show_popup_dialog( @@ -3395,7 +3394,7 @@ if ($("input[name='_is_html']").val() == '1') { var editor = tinyMCE.get(this.env.composebody); editor.getWin().focus(); // correct focus in IE & Chrome - editor.selection.setContent(insert, { format:'text' }); + editor.selection.setContent(this.quote_html(insert).replace(/\r?\n/g, '<br/>'), { format:'text' }); } // replace selection in compose textarea else { @@ -3609,15 +3608,19 @@ { var rc; - if (!this.env.draft_id && id && (rc = this.opener())) { - // refresh the drafts folder in opener window - if (rc.env.task == 'mail' && rc.env.action == '' && rc.env.mailbox == this.env.drafts_mailbox) - rc.command('checkmail'); + if (id && id != this.env.draft_id) { + if (rc = this.opener()) { + // refresh the drafts folder in opener window + if (rc.env.task == 'mail' && rc.env.action == '' && rc.env.mailbox == this.env.drafts_mailbox) + rc.command('checkmail'); + } + + this.env.draft_id = id; + $("input[name='_draft_saveid']").val(id); + } - this.env.draft_id = id; - $("input[name='_draft_saveid']").val(id); - + // always remove local copy upon saving as draft this.remove_compose_data(this.env.compose_id); }; @@ -3681,6 +3684,9 @@ if (this.env.draft_id) { formdata.draft_id = this.env.draft_id; + } + if (this.env.reply_msgid) { + formdata.reply_msgid = this.env.reply_msgid; } $('input, select, textarea', this.gui_objects.messageform).each(function(i, elem) { @@ -5048,6 +5054,7 @@ { var key = 'G'+prop.source+prop.id; if (this.treelist.remove(key)) { + this.triggerEvent('group_delete', { source:prop.source, id:prop.id }); delete this.env.contactfolders[key]; delete this.env.contactgroups[key]; } @@ -5625,14 +5632,15 @@ this.subscription_list = new rcube_list_widget(this.gui_objects.subscriptionlist, {multiselect:false, draggable:true, keyboard:false, toggleselect:true}); - this.subscription_list.addEventListener('select', function(o){ p.subscription_select(o); }); - this.subscription_list.addEventListener('dragstart', function(o){ p.drag_active = true; }); - this.subscription_list.addEventListener('dragend', function(o){ p.subscription_move_folder(o); }); - this.subscription_list.row_init = function (row) { - row.obj.onmouseover = function() { p.focus_subscription(row.id); }; - row.obj.onmouseout = function() { p.unfocus_subscription(row.id); }; - }; - this.subscription_list.init(); + this.subscription_list + .addEventListener('select', function(o){ p.subscription_select(o); }) + .addEventListener('dragstart', function(o){ p.drag_active = true; }) + .addEventListener('dragend', function(o){ p.subscription_move_folder(o); }) + .addEventListener('initrow', function (row) { + row.obj.onmouseover = function() { p.focus_subscription(row.id); }; + row.obj.onmouseout = function() { p.unfocus_subscription(row.id); }; + }) + .init(); $('#mailboxroot') .mouseover(function(){ p.focus_subscription(this.id); }) @@ -5757,19 +5765,23 @@ .prop({checked: subscribed ? true : false, disabled: is_protected ? true : false}); // add to folder/row-ID map - this.env.subscriptionrows[id] = [name, display_name, 0]; + this.env.subscriptionrows[id] = [name, display_name, false]; // sort folders (to find a place where to insert the row) // replace delimiter with \0 character to fix sorting // issue where 'Abc Abc' would be placed before 'Abc/def' var replace_from = RegExp(RegExp.escape(this.env.delimiter), 'g'), replace_to = String.fromCharCode(0); + $.each(this.env.subscriptionrows, function(k,v) { - var n = v[0]; - n = n.replace(replace_from, replace_to); - v.push(n); + if (v.length < 4) { + var n = v[0]; + n = n.replace(replace_from, replace_to); + v.push(n); + } folders.push(v); }); + folders.sort(function(a, b) { var len = a.length - 1; n1 = a[len], n2 = b[len]; return n1 < n2 ? -1 : 1; @@ -5828,8 +5840,11 @@ // replace an existing table row with a new folder line (with subfolders) this.replace_folder_row = function(oldfolder, newfolder, display_name, is_protected, class_name) { - if (!this.gui_objects.subscriptionlist) + if (!this.gui_objects.subscriptionlist) { + if (this.is_framed) + return parent.rcmail.replace_folder_row(oldfolder, newfolder, display_name, is_protected, class_name); return false; + } var i, n, len, name, dispname, oldrow, tmprow, row, level, tbody = this.gui_objects.subscriptionlist.tBodies[0], @@ -5839,6 +5854,13 @@ subscribed = $('input[name="_subscribed[]"]', $('#'+id)).prop('checked'), // find subfolders of renamed folder list = this.get_subfolders(oldfolder); + + // no renaming, only update class_name + if (oldfolder == newfolder) { + $('#'+id).attr('class', class_name || ''); + this.subscription_list.focus(); + return; + } // replace an existing table row this._remove_folder_row(id); @@ -6347,12 +6369,14 @@ this.mark_folder = function(name, class_name, prefix, encode) { $(this.get_folder_li(name, prefix, encode)).addClass(class_name); + this.triggerEvent('markfolder', {folder: name, mark: class_name, status: true}); }; // adds a class to selected folder this.unmark_folder = function(name, class_name, prefix, encode) { $(this.get_folder_li(name, prefix, encode)).removeClass(class_name); + this.triggerEvent('markfolder', {folder: name, mark: class_name, status: false}); }; // helper method to find a folder list item @@ -6454,6 +6478,12 @@ this.triggerEvent('setquota', content); this.env.quota_content = content; + }; + + // update trash folder state + this.set_trash_count = function(count) + { + this[(count ? 'un' : '') + 'mark_folder'](this.env.trash_mailbox, 'empty', '', true); }; // update the mailboxlist @@ -6560,6 +6590,105 @@ $(elem).removeClass('hide-headers').addClass('show-headers'); $(this.gui_objects.all_headers_row).hide(); elem.onclick = function() { rcmail.command('show-headers', '', elem); }; + }; + + // create folder selector popup, position and display it + this.folder_selector = function(obj, callback) + { + var container = this.folder_selector_element; + + if (!container) { + var rows = [], + delim = this.env.delimiter, + ul = $('<ul class="toolbarmenu iconized">'), + li = document.createElement('li'), + link = document.createElement('a'), + span = document.createElement('span'); + + container = $('<div id="folder-selector" class="popupmenu"></div>'); + link.href = '#'; + link.className = 'icon'; + + // loop over sorted folders list + $.each(this.env.mailboxes_list, function() { + var tmp, n = 0, s = 0, + folder = ref.env.mailboxes[this], + id = folder.id, + a = link.cloneNode(false), row = li.cloneNode(false); + + if (folder.virtual) + a.className += ' virtual'; + else { + a.className += ' active'; + a.onclick = function() { container.hide().data('callback')(folder.id); }; + } + + if (folder['class']) + a.className += ' ' + folder['class']; + + // calculate/set indentation level + while ((s = id.indexOf(delim, s)) >= 0) { + n++; s++; + } + a.style.paddingLeft = n ? (n * 16) + 'px' : 0; + + // add folder name element + tmp = span.cloneNode(false); + $(tmp).text(folder.name); + a.appendChild(tmp); + + row.appendChild(a); + rows.push(row); + }); + + ul.append(rows).appendTo(container); + + // temporarily show element to calculate its size + container.css({left: '-1000px', top: '-1000px'}) + .appendTo($('body')).show(); + + // set max-height if the list is long + if (rows.length > 10) + container.css('max-height', $('li', container)[0].offsetHeight * 10 + 9) + + // hide selector on click out of selector element + var fn = function(e) { if (e.target != container.get(0)) container.hide(); }; + $(document.body).on('mouseup', fn); + $('iframe').contents().on('mouseup', fn) + .load(function(e) { try { $(this).contents().on('mouseup', fn); } catch(e) {}; }); + + this.folder_selector_element = container; + } + + // position menu on the screen + this.element_position(container, obj); + + container.show().data('callback', callback); + }; + + // position a menu element on the screen in relation to other object + this.element_position = function(element, obj) + { + var obj = $(obj), win = $(window), + width = obj.width(), + height = obj.height(), + win_height = win.height(), + elem_height = $(element).height(), + elem_width = $(element).width(), + pos = obj.offset(), + top = pos.top, + left = pos.left + width; + + if (top + elem_height > win_height) { + top -= elem_height - height; + if (top < 0) + top = Math.max(0, (win_height - elem_height) / 2); + } + + if (left + elem_width > win.width()) + left -= elem_width + width; + + element.css({left: left + 'px', top: top + 'px'}); }; @@ -6831,6 +6960,16 @@ case 'refresh': case 'check-recent': + // update message flags + $.each(this.env.recent_flags || {}, function(uid, flags) { + ref.set_message(uid, 'deleted', flags.deleted); + ref.set_message(uid, 'replied', flags.answered); + ref.set_message(uid, 'unread', !flags.seen); + ref.set_message(uid, 'forwarded', flags.forwarded); + ref.set_message(uid, 'flagged', flags.flagged); + }); + delete this.env.recent_flags; + case 'getunread': case 'search': this.env.qsearch = null; @@ -7154,13 +7293,18 @@ if (this.gui_objects.mailboxlist) params._folderlist = 1; - if (this.gui_objects.messagelist) - params._list = 1; if (this.gui_objects.quotadisplay) params._quota = 1; if (this.env.search_request) params._search = this.env.search_request; + if (this.gui_objects.messagelist) { + params._list = 1; + + // message uids for flag updates check + params._uids = $.map(this.message_list.rows, function(row, uid) { return uid; }).join(','); + } + return params; }; -- Gitblit v1.9.1