From: vyshane <vyshane>
Date: Fri, 17 Nov 2006 02:58:56 +0000 (+0000)
Subject: Merged from 1.7.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1ca226c130595450669cc7bf4db70d2cc7b6877d;p=moodle.git

Merged from 1.7.
---

diff --git a/lib/ajax/block_classes.js b/lib/ajax/block_classes.js
index a94aae48c8..69fb703d4f 100644
--- a/lib/ajax/block_classes.js
+++ b/lib/ajax/block_classes.js
@@ -243,18 +243,20 @@ block_class.prototype.toggle_hide = function(e, target, isCosmetic) {
 
 
 block_class.prototype.delete_button = function() {
-
-	//remove from local model
+	// Remove from local model.
     if (main.rightcolumn.has_block(this)) {
     	main.rightcolumn.remove_block(this);
     } else if (main.leftcolumn.has_block(this)) {
         main.leftcolumn.remove_block(this);
  	}
-    //remove from remote model
-    main.connect('DELETE','class=block&instanceId='+this.instanceId);
+	// Remove block from the drag and drop group in YUI.
+	this.removeFromGroup('blocks');
+
+    // Remove from remote model.
+    main.connect('DELETE', 'class=block&instanceId='+this.instanceId);
         
-    //remove from view
-    main.blocks[main.get_block_index(this)] = null;
+    // Remove from view
+	main.blocks.splice(main.get_block_index(this), 1);
     this.getEl().parentNode.removeChild(this.getEl());
 
 	if (this.debug) {