--- eventblock.js	2007-07-13 15:22:06.000000000 +0200
+++ /home/gas/modules/event/eventblock.js	2007-09-10 23:35:12.546674864 +0200
@@ -32,8 +32,8 @@ function blockUpdater(element,url,callba
   // Keep block at it's current width/height to make the update less disruptive
   this.styleHeight = $(element).height();
   this.styleWidth  = $(element).width();
-  $(element).height(element.offsetHeight+"px");
-  $(element).width(element.offsetWidth+"px");
+  $(element).height(element[0].offsetHeight+"px");
+  $(element).width(element[0].offsetWidth+"px");
 
   // Clear block contents
   $(element).html("");
@@ -53,42 +53,22 @@ function blockUpdater(element,url,callba
   this.element.prepend($(cancel)); 
 
   this.dontUpdate = false;
-
-  $(this).ajaxComplete(function(settings, request) {
-     this.update(settings, request, this); 
-  }); 
-  /**
-   * the cancel button doesnt work sometimes, probably the ajax process completes first, 
-   * and despite the click event ajaxComplete will run, and this.dontUpdate 
-   * will be false for that run 
-   */
-
-  $.ajax({
-    type: "GET",
-    url: url
-  });
+ $.get(url,function(data){
+     blockUpdate.update(data)});
 }
-
-blockUpdater.prototype.update = function (result, xmlHttp, blockUpdate) {
+blockUpdater.prototype.update = function (xmlHttp) {
+  var blockUpdate=this;
   if(!blockUpdate.dontUpdate) {
-    blockUpdate.element.height(blockUpdate.styleHeight); 
-    blockUpdate.element.width(blockUpdate.styleWidth);
-
-    if (result!=undefined && result!="abort") {
-      blockUpdate.element.html(xmlHttp.responseText);
-      blockUpdate.dontUpdate = true;
-    }
-    else if (result == "abort") {
-      blockUpdate.element.html(this.oldHTML);
-      blockUpdate.element.append("<p class='calendar-log'>Update aborted.</p>");
-      blockUpdate.dontUpdate = true;
-    }
-    else {
-      blockUpdate.element.html(this.oldHTML);
-      blockUpdate.element.append("<p class='calendar-log'>Update failed</p>");
-      blockUpdate.dontUpdate = true;
-    }
-
+   if(xmlHttp == 'abort') {
+     blockUpdate.element.html(this.oldHTML);
+     blockUpdate.element.append("<p class='calendar-log'>Update aborted.</p>");
+    } else {
+     blockUpdate.element.height(blockUpdate.styleHeight); 
+     blockUpdate.element.width(blockUpdate.styleWidth);
+     blockUpdate.element.html(xmlHttp);
+     blockUpdate.dontUpdate = true;
+   }
+    blockUpdate.dontUpdate = true;
     if(blockUpdate.callback != undefined)
       blockUpdate.callback();
   }