Revert "Feat: destroy() method for widgets to do custom cleanup (#6699)"

This reverts commit 474b73bdbe.

core/modules/storyviews/classic.js

@@ -80,7 +80,7 @@ ClassicStoryView.prototype.remove = function(widget) {
 	if(duration) {
 		var targetElement = widget.findFirstDomNode(),
 			removeElement = function() {
-				widget.destroy();
+				widget.removeChildDomNodes();
 			};
 		// Abandon if the list entry isn't a DOM element (it might be a text node)
 		if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
@@ -112,7 +112,7 @@ ClassicStoryView.prototype.remove = function(widget) {
 			{opacity: "0.0"}
 		]);
 	} else {
-		widget.destroy();
+		widget.removeChildDomNodes();
 	}
 };
 

core/modules/storyviews/pop.js

@@ -73,7 +73,7 @@ PopStoryView.prototype.remove = function(widget) {
 		duration = $tw.utils.getAnimationDuration(),
 		removeElement = function() {
 			if(targetElement && targetElement.parentNode) {
-				widget.destroy();
+				widget.removeChildDomNodes();
 			}
 		};
 	// Abandon if the list entry isn't a DOM element (it might be a text node)

core/modules/storyviews/zoomin.js

@@ -154,7 +154,7 @@ ZoominListView.prototype.remove = function(widget) {
 	var targetElement = widget.findFirstDomNode(),
 		duration = $tw.utils.getAnimationDuration(),
 		removeElement = function() {
-			widget.destroy();
+			widget.removeChildDomNodes();
 		};
 	// Abandon if the list entry isn't a DOM element (it might be a text node)
 	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {

core/modules/widgets/importvariables.js

@@ -122,7 +122,7 @@ ImportVariablesWidget.prototype.refresh = function(changedTiddlers) {
 	}
 	if(changedAttributes.filter || !$tw.utils.isArrayEqual(this.tiddlerList,tiddlerList) || haveListedTiddlersChanged()) {
 		// Compute the filter
-		this.destroy();
+		this.removeChildDomNodes();
 		this.execute(tiddlerList);
 		this.renderChildren(this.parentDomNode,this.findNextSiblingDomNode());
 		return true;

core/modules/widgets/list.js

@@ -219,7 +219,7 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 	} else {
 		// If the list was empty then we need to remove the empty message
 		if(prevList.length === 0) {
-			this.destroy();
+			this.removeChildDomNodes();
 			this.children = [];
 		}
 		// If we are providing an counter variable then we must refresh the items, otherwise we can rearrange them
@@ -312,7 +312,7 @@ ListWidget.prototype.removeListItem = function(index) {
 	if(this.storyview && this.storyview.remove) {
 		this.storyview.remove(widget);
 	} else {
-		widget.destroy();
+		widget.removeChildDomNodes();
 	}
 	// Remove the child widget
 	this.children.splice(index,1);

core/modules/widgets/widget.js

@@ -688,7 +688,7 @@ Rebuild a previously rendered widget
 */
 Widget.prototype.refreshSelf = function() {
 	var nextSibling = this.findNextSiblingDomNode();
-	this.removeChildDomNodes({ recursive: true });
+	this.removeChildDomNodes();
 	this.render(this.parentDomNode,nextSibling);
 };
 
@@ -753,42 +753,19 @@ Widget.prototype.findFirstDomNode = function() {
 /*
 Remove any DOM nodes created by this widget or its children
 */
-Widget.prototype.removeChildDomNodes = function(options) {
-	var recursive = options && options.recursive;
-	/**
-	 * If this widget has directly created DOM nodes, delete them and exit.
-	 * This assumes that any child widgets are contained within the created DOM nodes, which would normally be the case
-	 */
+Widget.prototype.removeChildDomNodes = function() {
+	// If this widget has directly created DOM nodes, delete them and exit. This assumes that any child widgets are contained within the created DOM nodes, which would normally be the case
 	if(this.domNodes.length > 0) {
 		$tw.utils.each(this.domNodes,function(domNode) {
 			domNode.parentNode.removeChild(domNode);
 		});
 		this.domNodes = [];
-		return true;
-	} else if(recursive) {
+	} else {
 		// Otherwise, ask the child widgets to delete their DOM nodes
 		$tw.utils.each(this.children,function(childWidget) {
-			childWidget.removeChildDomNodes(options);
+			childWidget.removeChildDomNodes();
 		});
 	}
-	return false
-};
-
-/*
-Inform widget subclass that extends this widget and children widgets of this widget. Let them know this widget tree is about to destroy, and dom nodes are being unmounted from the document.
-*/
-Widget.prototype.destroy = function(options) {
-	// removeDom by default
-	var removeDom = (options && options.removeDom) || true;
-	if (removeDom) {
-		// prepare options for children, if we have removed the dom, child don't need to remove their dom
-		removeDom = !this.removeChildDomNodes();
-	}
-	// nothing need to do, as dom is already removed in the removeChildDomNodes
-	// we just need to inform the children
-	$tw.utils.each(this.children,function(childWidget) {
-		childWidget.destroy({ removeDom: removeDom });
-	});
 };
 
 /*

plugins/tiddlywiki/cecily/cecily.js

@@ -62,7 +62,7 @@ CecilyStoryView.prototype.remove = function(widget) {
 		duration = $tw.utils.getAnimationDuration();
 	// Remove the widget at the end of the transition
 	setTimeout(function() {
-		widget.destroy();
+		widget.removeChildDomNodes();
 	},duration);
 	// Animate the closure
 	$tw.utils.setStyle(targetElement,[

plugins/tiddlywiki/stacked-view/stacked.js

@@ -80,7 +80,7 @@ StackedListView.prototype.insert = function(widget) {
 };
 
 StackedListView.prototype.remove = function(widget) {
-	widget.destroy();
+	widget.removeChildDomNodes();
 };
 
 exports.stacked = StackedListView;