From 96357418460cd4a48a52b57d5f3b980973befd62 Mon Sep 17 00:00:00 2001
From: tonio <tonio@ngyn.org>
Date: Tue, 28 Dec 2010 17:52:05 +0100
Subject: [PATCH] fixed #82

The timer was not cleared on message dragging. (which updates the listing if the current selection is dropped in a folder)

see #85

Automatic page refresh is now disabled on message dragging.
---
 .../webmail/templates/webmail/index.html      | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/extensions/webmail/templates/webmail/index.html b/extensions/webmail/templates/webmail/index.html
index d941e17f7..58b6c3f86 100644
--- a/extensions/webmail/templates/webmail/index.html
+++ b/extensions/webmail/templates/webmail/index.html
@@ -154,12 +154,16 @@
   var rtimer = null;
 
   window.addEvent("pageRefresh", function() {
-    $clear(rtimer);
+    console.log("timer : ", rtimer);
+    if (rtimer) {
+      clearInterval(rtimer);
+      rtimer = null;
+    }
   });
 
   refreshFolder = function() {
     var query = current_anchor.serialized.substring(1);
-    $clear(rtimer);
+    clearInterval(rtimer);
     infobox.show('{% trans "Reloading..." %}', {
         profile : "gray",
         spinner : true
@@ -232,6 +236,7 @@
 	    .inject(document.body);
 	block.store("parent", this.element);
         this.element = block;
+	clearInterval(rtimer);
     };
 
     start_dragging = function(item) {
@@ -253,13 +258,18 @@
 	droppable.removeClass("dragging");
     };
 
-    drop_element = function(item, droppable, event) {
+    restore_parent = function(item) {
 	var parent = item.retrieve("parent");
 
+	this.element = parent;
+	rtimer = refreshFolder.periodical({{ refreshrate }});
+    };
+
+    drop_element = function(item, droppable, event) {
 	this.element.dispose();
         delete(this.element);
         if (!droppable) {
-	    this.element = parent;
+	    restore_parent(item);
 	    return;
         }
         droppable.removeClass("dragging");
@@ -273,10 +283,9 @@
     };
 
     cancel_dragging = function(item) {
-	var parent = item.retrieve("parent");
 	this.element.dispose();
         delete(this.element);
-	this.element = parent;
+	restore_parent(item);
     };
 
     $$("td[class*=draggable]").each(function(item) {