diff options
| author | robin <robin@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-03-31 14:49:54 +0000 |
|---|---|---|
| committer | robin <robin@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-03-31 14:49:54 +0000 |
| commit | 4f8a952d01fde49876299decb3dbfbd2f0f7a784 (patch) | |
| tree | d0b03ab7e9501e423853438ae2e46ea4c84ce071 /roundcubemail | |
| parent | b5e1f23ff88c58e8f8d39c23cfd81ca634f7dfc0 (diff) | |
Don't preview message if dragging or multi-selecting it, closes #1484316.
git-svn-id: https://svn.roundcube.net/trunk@1225 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/program/js/app.js | 3 | ||||
| -rw-r--r-- | roundcubemail/program/js/list.js | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index a20a699ff..6e01dac9a 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/program/js/app.js @@ -133,6 +133,7 @@ function rcube_webmail() 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_active = true; }); + this.message_list.addEventListener('dragstart', function(o){ p.drag_active = true; if (p.preview_timer) clearTimeout(p.preview_timer); }); this.message_list.addEventListener('dragend', function(o){ p.drag_active = false; }); this.message_list.init(); @@ -1138,7 +1139,7 @@ function rcube_webmail() } // start timer for message preview (wait for double click) - if (selected && this.env.contentframe) + if (selected && this.env.contentframe && !list.multi_selecting) this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, this.dblclick_time + 10); else if (this.env.contentframe) this.show_contentframe(false); diff --git a/roundcubemail/program/js/list.js b/roundcubemail/program/js/list.js index e42d3f6b7..8ff0b2ddd 100644 --- a/roundcubemail/program/js/list.js +++ b/roundcubemail/program/js/list.js @@ -35,6 +35,7 @@ function rcube_list_widget(list, p) this.subject_col = -1; this.shiftkey = false; this.multiselect = false; + this.multi_selecting = false; this.draggable = false; this.keyboard = false; this.toggleselect = false; @@ -319,6 +320,7 @@ select_row: function(id, mod_key, with_mouse) { this.shift_start = id; this.highlight_row(id, false); + this.multi_selecting = false; } else { @@ -341,6 +343,7 @@ select_row: function(id, mod_key, with_mouse) this.highlight_row(id, false); break; } + this.multi_selecting = true; } // trigger event if selection changed |