inlined disposal callback invocations

Author: justlep

package.json

@@ -2,7 +2,7 @@
   "name": "knockout-esnext",
   "description": "A modernized fork of Knockout.js intended for ES6+ browsers only",
   "homepage": "http://knockoutjs.com/",
-  "version": "3.5.1-mod24",
+  "version": "3.5.1-mod25-pre",
   "license": "MIT",
   "author": "The Knockout.js team",
   "main": "build/output/knockout-latest.js",

src/utils.domData.js

@@ -60,23 +60,3 @@ export const getCurriedDomDataArrayItemAddFunctionForArrayDomDataKey = (itemArra
         dataForNode[itemArrayDomDataKey] = [itemToAdd];
     }
 };
-
-/**
- * Returns a function that will 
- *  (1) run all (function-)items of an array located under the node's domData[itemArrayDomDataKey], passing the node as parameter
- *  (2) clear the node's DOM data
- * @param {string} itemArrayDomDataKey
- * @return {function(Node): void}
- */
-export const getCurriedDomDataArrayInvokeEachAndClearDomDataFunctionForArrayDomDataKey = (itemArrayDomDataKey) => (node) => {
-    let dataForNode = node[DOM_DATASTORE_PROP];
-    if (dataForNode) {
-        let itemArray = dataForNode[itemArrayDomDataKey];
-        if (itemArray) {
-            for (let i = 0, _fns = itemArray.slice(0), len = _fns.length; i < len; i++) {
-                _fns[i](node);
-            }
-        }
-        delete node[DOM_DATASTORE_PROP];
-    }    
-};

src/utils.domNodeDisposal.js

@@ -1,7 +1,8 @@
-import {nextDomDataKey,
-        getCurriedDomDataArrayInvokeEachAndClearDomDataFunctionForArrayDomDataKey,
-        getCurriedDomDataArrayItemAddFunctionForArrayDomDataKey,
-        getCurriedDomDataArrayItemRemovalFunctionForArrayDomDataKey} from './utils.domData';
+import {DOM_DATASTORE_PROP,
+    nextDomDataKey,
+    getCurriedDomDataArrayItemAddFunctionForArrayDomDataKey,
+    getCurriedDomDataArrayItemRemovalFunctionForArrayDomDataKey, getDomData
+} from './utils.domData';
 import {ignoreDependencyDetectionNoArgs} from './subscribables/dependencyDetection';
 
 const DISPOSE_CALLBACKS_DOM_DATA_KEY = nextDomDataKey();
@@ -15,12 +16,19 @@ const _isNodeTypeCleanableWithDescendents = nodeType => nodeType === 1 || nodeTy
 export let _cleanExternalData = null;
 export const _overrideCleanExternalData = (fn) => _cleanExternalData = fn;
 
-const _runDisposalCallbacksAndClearDomData = getCurriedDomDataArrayInvokeEachAndClearDomDataFunctionForArrayDomDataKey(DISPOSE_CALLBACKS_DOM_DATA_KEY);
-
 const _cleanSingleNode = (node) => {
     // Run all the dispose callbacks & ease the DOM data
-    _runDisposalCallbacksAndClearDomData(node);
-
+    let domData = node[DOM_DATASTORE_PROP];
+    if (domData) {
+        let disposeCallbackFns = domData[DISPOSE_CALLBACKS_DOM_DATA_KEY];
+        if (disposeCallbackFns) {
+            for (let fn of disposeCallbackFns.slice(0)) {
+                fn(node);
+            }
+        }
+        delete node[DOM_DATASTORE_PROP];
+    }
+    
     // Perform cleanup needed by external libraries (currently only jQuery, but can be extended)
     if (_cleanExternalData) {
         _cleanExternalData(node);