ko.utils.domNodeDisposal.addDisposeCallback to ko.addDisposeCallback

Author: the-djmaze

dev/External/User/ko.js

@@ -97,7 +97,7 @@ Object.assign(ko.bindingHandlers, {
 
 				fValue.subscribe(fUpdateEditorValue);
 
-				// ko.utils.domNodeDisposal.addDisposeCallback(element, () => {
+				// ko.addDisposeCallback(element, () => {
 				// });
 			}
 		}

dev/External/ko.js

@@ -31,7 +31,7 @@ export const
 
 	onEvent = (element, event, fn) => {
 		element.addEventListener(event, fn);
-		ko.utils.domNodeDisposal.addDisposeCallback(element, () => element.removeEventListener(event, fn));
+		ko.addDisposeCallback(element, () => element.removeEventListener(event, fn));
 	},
 
 	onKey = (key, element, fValueAccessor, fAllBindings, model) => {

plugins/avatars/index.php

@@ -80,7 +80,6 @@ private function JsonAvatar($message) : ?string
 				|| ($this->Config()->Get('plugin', 'favicon', false) && 'pass' == $mFrom['dkimStatus'])
 			 )
 			) {
-//				return \MailSo\Base\Utils::UrlSafeBase64Encode(\mb_strtolower($mFrom['email']));
 				return 'remote';
 			}
 			if ('pass' == $mFrom['dkimStatus'] && $this->Config()->Get('plugin', 'service', true)) {
@@ -186,21 +185,29 @@ protected function configMapping() : array
 		return $aResult;
 	}
 
-	// Only allow service icon when DKIM is valid. $bBimi is true when DKIM is valid.
-	private static function getServiceIcon(string $sEmail) : ?string
+	private static function getServicePng(string $sDomain) : ?string
 	{
-		$sDomain = \explode('@', $sEmail);
-		$sDomain = \array_pop($sDomain);
 		$aServices = [
 			"services/{$sDomain}",
 			'services/' . static::serviceDomain($sDomain)
 		];
 		foreach ($aServices as $service) {
 			$file = __DIR__ . "/images/{$service}.png";
 			if (\file_exists($file)) {
-				return 'data:image/png;base64,' . \base64_encode(\file_get_contents($file));
+				return $file;
 			}
 		}
+		return null;
+	}
+
+	// Only allow service icon when DKIM is valid. $bBimi is true when DKIM is valid.
+	private static function getServiceIcon(string $sEmail) : ?string
+	{
+		$aParts = \explode('@', $sEmail);
+		$file = static::getServicePng(\array_pop($aParts));
+		if ($file) {
+			return 'data:image/png;base64,' . \base64_encode(\file_get_contents($file));
+		}
 
 		$aResult = static::getCachedImage($sEmail);
 		if ($aResult) {
@@ -282,20 +289,13 @@ private function getAvatar(string $sEmail, bool $bBimi, string $sBimiSelector =
 
 		// Only allow service icon when DKIM is valid. $bBimi is true when DKIM is valid.
 		if ($bBimi && !$aResult) {
-			$aServices = [
-				"services/{$sDomain}",
-				'services/' . static::serviceDomain($sDomain)
-			];
-			foreach ($aServices as $service) {
-				$file = __DIR__ . "/images/{$service}.png";
-				if (\file_exists($file)) {
-					\MailSo\Base\Http::setLastModified(\filemtime($file));
-					$aResult = [
-						'image/png',
-						\file_get_contents($file)
-					];
-					break;
-				}
+			$file = static::getServicePng($sDomain);
+			if ($file) {
+				\MailSo\Base\Http::setLastModified(\filemtime($file));
+				$aResult = [
+					'image/png',
+					\file_get_contents($file)
+				];
 			}
 
 			if (!$aResult && $this->Config()->Get('plugin', 'favicon', false)) {

vendors/knockout/build/output/knockout-latest.debug.js

@@ -121,7 +121,7 @@ ko.utils = {
         element.textContent = ko.utils.unwrapObservable(textContent)
 };
 
-ko.exportSymbol('utils', ko.utils);
+//ko.exportSymbol('utils', ko.utils);
 ko.exportSymbol('unwrap', ko.utils.unwrapObservable); // Convenient shorthand, because this is used so commonly
 (() => {
 
@@ -195,7 +195,7 @@ ko.utils.domNodeDisposal = (() => {
     };
 
     return {
-        'addDisposeCallback' : (node, callback) => {
+        addDisposeCallback : (node, callback) => {
             if (typeof callback != "function")
                 throw Error("Callback must be a function");
             getDisposeCallbacksCollection(node, 1).add(callback);
@@ -232,7 +232,8 @@ ko.utils.domNodeDisposal = (() => {
 })();
 ko.cleanNode = ko.utils.domNodeDisposal.cleanNode; // Shorthand name for convenience
 ko.removeNode = ko.utils.domNodeDisposal.removeNode; // Shorthand name for convenience
-ko.exportSymbol('utils.domNodeDisposal', ko.utils.domNodeDisposal);
+//ko.exportSymbol('utils.domNodeDisposal', ko.utils.domNodeDisposal);
+ko.exportSymbol('addDisposeCallback', ko.utils.domNodeDisposal.addDisposeCallback);
 ko['extenders'] = {
     'debounce': (target, timeout) => target.limit(callback => debounce(callback, timeout)),
 
@@ -295,7 +296,7 @@ class koSubscription
     disposeWhenNodeIsRemoved(node) {
         // MutationObserver ?
         this._node = node;
-        ko.utils.domNodeDisposal['addDisposeCallback'](node, this._domNodeDisposalCallback = this['dispose'].bind(this));
+        ko.utils.domNodeDisposal.addDisposeCallback(node, this._domNodeDisposalCallback = this['dispose'].bind(this));
     }
 }
 
@@ -881,7 +882,7 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
     // Attach a DOM node disposal callback so that the computed will be proactively disposed as soon as the node is
     // removed using ko.removeNode. But skip if isActive is false (there will never be any dependencies to dispose).
     if (state.disposeWhenNodeIsRemoved && computedObservable.isActive()) {
-        ko.utils.domNodeDisposal['addDisposeCallback'](state.disposeWhenNodeIsRemoved, state.domNodeDisposalCallback = () => {
+        ko.utils.domNodeDisposal.addDisposeCallback(state.disposeWhenNodeIsRemoved, state.domNodeDisposalCallback = () => {
             computedObservable['dispose']();
         });
     }
@@ -1537,17 +1538,15 @@ ko.expressionRewriting = (() => {
                 ko.utils.setDomNodeChildren(node, childNodes);
         },
 
-        prepend: (containerNode, nodeToPrepend) => {
-            // Start comments must always have a parent and at least one following sibling (the end comment)
-            isStartComment(containerNode)
-                ? containerNode.nextSibling.before(nodeToPrepend)
-                : containerNode.prepend(nodeToPrepend);
-        },
-
         insertAfter: (containerNode, nodeToInsert, insertAfterNode) => {
             insertAfterNode
                 ? insertAfterNode.after(nodeToInsert)
-                : ko.virtualElements.prepend(containerNode, nodeToInsert);
+                : (
+                    // Start comments must always have a parent and at least one following sibling (the end comment)
+                    isStartComment(containerNode)
+                        ? containerNode.nextSibling.before(nodeToInsert)
+                        : containerNode.prepend(nodeToInsert)
+                );
         },
 
         firstChild: node => {
@@ -1790,7 +1789,7 @@ class AsyncCompleteContext {
         this.asyncDescendants = new Set;
         this.childrenComplete = false;
 
-        bindingInfo.asyncContext || ko.utils.domNodeDisposal['addDisposeCallback'](node, asyncContextDispose);
+        bindingInfo.asyncContext || ko.utils.domNodeDisposal.addDisposeCallback(node, asyncContextDispose);
 
         if (ancestorBindingInfo?.asyncContext) {
             ancestorBindingInfo.asyncContext.asyncDescendants.add(node);
@@ -2206,7 +2205,7 @@ ko.exportSymbol('bindingHandlers', ko.bindingHandlers);
                 };
 
             ko.virtualElements.emptyNode(element);
-            ko.utils.domNodeDisposal['addDisposeCallback'](element, disposeAssociatedComponentViewModel);
+            ko.utils.domNodeDisposal.addDisposeCallback(element, disposeAssociatedComponentViewModel);
 
             ko.computed(() => {
                 var componentName = ko.utils.unwrapObservable(valueAccessor()),