From: vyshane <vyshane>
Date: Thu, 25 Jan 2007 04:37:39 +0000 (+0000)
Subject: Merged from 1.7.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e50b0ad904e0d9d53e2bb7211bb2f2377746bced;p=moodle.git

Merged from 1.7.
---

diff --git a/lib/ajax/section_classes.js b/lib/ajax/section_classes.js
index 9814bfd7fa..9256bf9de9 100755
--- a/lib/ajax/section_classes.js
+++ b/lib/ajax/section_classes.js
@@ -359,6 +359,13 @@ section_class.prototype.get_resource_index = function(el) {
 
 
 section_class.prototype.remove_resource = function(el) {
+
+    var resourceEl = el.getEl();
+    var parentEl = resourceEl.parentNode;
+    if (!parentEl) {
+        return false;
+    }
+
     var resourceCount = this.resources.length;
 
     if (resourceCount == 1) {
@@ -380,20 +387,22 @@ section_class.prototype.remove_resource = function(el) {
             }
         }
     }
-    if (el.getEl().parentNode) {
-        // Remove any extra text nodes to keep DOM clean.
-	    var kids = el.getEl().parentNode.childNodes;
-    	var i = kids.length;
-    	while (i--) {
-    		if (kids[i].nodeType == 3) {
-    	    	kids[i].parentNode.removeChild(kids[i]);
-    	    }
-    	}
-        // Remove the resource.
-    	YAHOO.log("Removing "+el.getEl().id);
-    	el.getEl().parentNode.removeChild(el.getEl());
-    }
+    // Remove any extra text nodes to keep DOM clean.
+    var kids = parentEl.childNodes;
+
+	for (var i=0; i<kids.length; i++) {
+	    if (kids[i].nodeType == 3) {
+	        YAHOO.log('Removed extra text node.');
+	    	parentEl.removeChild(kids[i]);
+	    }
+	}
+	// Remove the resource.
+	// FIXME
+	// Line below is causing IE 6 and 7 to freeze.
+	parentEl.removeChild(resourceEl);
+
     this.write_sequence_list();
+    return true;
 }
 
 
@@ -763,7 +772,7 @@ resource_class.prototype.delete_button = function() {
     if (!confirm(main.getString('deletecheck', main.getString(this.is)+" "+this.id))) {
         return false;
     }
-    this.getEl().parentNode.removeChild(this.getEl());
+    //this.getEl().parentNode.removeChild(this.getEl());
     this.parentObj.remove_resource(this);
 
     main.connect('DELETE', 'class=resource&id='+this.id);
@@ -827,7 +836,7 @@ resource_class.prototype.onDragOut = function(e, ids) {
 }
 
 
-resource_class.prototype.onDragDrop = function(e, ids) {YAHOO.log('onDragDrop');
+resource_class.prototype.onDragDrop = function(e, ids) {
 	var target = YAHOO.util.DDM.getBestMatch(ids);
 	if (!target) {
 		YAHOO.log('onDragDrop: Target is not valid!', 'error');