From 2965a981b7ec22866fbdf2d567d87e2d068d3617 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 31 Jul 2015 16:04:08 -0400
Subject: [PATCH] Allow to search and import missing PGP pubkeys from keyservers using Publickey.js
---
program/js/treelist.js | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/program/js/treelist.js b/program/js/treelist.js
index bb847d1..9e6baab 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -248,6 +248,11 @@
*/
function select(id)
{
+ // allow subscribes to prevent selection change
+ if (me.triggerEvent('beforeselect', indexbyid[id]) === false) {
+ return;
+ }
+
if (selection) {
id2dom(selection, true).removeClass('selected').removeAttr('aria-selected');
if (search_active)
@@ -329,7 +334,7 @@
// re-render the entire subtree
if (parent_node.children.length == 1) {
- render_node(parent_node, parent_li.parent(), parent_li);
+ render_node(parent_node, null, parent_li);
li = id2dom(node.id);
}
else {
@@ -360,6 +365,12 @@
}
indexbyid[node.id] = node;
+
+ // set new reference to node.html after insert
+ // will otherwise vanish in Firefox 3.6
+ if (typeof node.html == 'object') {
+ indexbyid[node.id].html = id2dom(node.id, true).children();
+ }
if (sort) {
resort_node(li, typeof sort == 'string' ? '[class~="' + sort + '"]' : '');
@@ -457,6 +468,10 @@
node.deleted = true;
delete indexbyid[id];
+
+ if (search_active) {
+ id2dom(id, false).remove();
+ }
return true;
}
@@ -907,9 +922,9 @@
* When dragging starts, compute absolute bounding boxes of the list and it's items
* for faster comparisons while mouse is moving
*/
- function drag_start()
+ function drag_start(force)
{
- if (drag_active)
+ if (!force && drag_active)
return;
drag_active = true;
@@ -1050,7 +1065,7 @@
autoexpand_item = id;
autoexpand_timer = setTimeout(function() {
expand(autoexpand_item);
- drag_start(); // re-calculate item coords
+ drag_start(true); // re-calculate item coords
autoexpand_item = null;
if (ui_droppable)
$.ui.ddmanager.prepareOffsets($.ui.ddmanager.current, null);
--
Gitblit v1.9.1