LPS-122449 Remove {delegate} usages of metal-dom

liferay-frontend · Nov 2, 2020 · 97ecbc9 · 97ecbc9
1 parent e43a888
commit 97ecbc9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/...esources/META-INF/resources/account_entries_admin/js/PersonAccountEntryEventHandler.es.js b/...esources/META-INF/resources/account_entries_admin/js/PersonAccountEntryEventHandler.es.js
@@ -12,13 +12,12 @@
  * details.
  */
 
-import {PortletBase, openSelectionModal} from 'frontend-js-web';
+import {PortletBase, delegate, openSelectionModal} from 'frontend-js-web';
 import * as dom from 'metal-dom';
 import {EventHandler} from 'metal-events';
 import {Config} from 'metal-state';
 
 class PersonAccountEntryEventHandler extends PortletBase {
-
 	/**
 	 * @inheritDoc
 	 */
@@ -39,7 +38,7 @@ class PersonAccountEntryEventHandler extends PortletBase {
 		);
 
 		this.eventHandler_.add(
-			dom.delegate(
+			delegate(
 				this.container,
 				'click',
 				this.removeUserLinkSelector,

diff --git a/...web/src/main/resources/META-INF/resources/adaptive_media/js/EditAdaptiveMediaConfig.es.js b/...web/src/main/resources/META-INF/resources/adaptive_media/js/EditAdaptiveMediaConfig.es.js
@@ -12,9 +12,8 @@
  * details.
  */
 
-import {PortletBase, normalizeFriendlyURL} from 'frontend-js-web';
+import {PortletBase, delegate, normalizeFriendlyURL} from 'frontend-js-web';
 import core from 'metal';
-import dom from 'metal-dom';
 
 const VALID_INPUT_KEYS = new Set([
 	'0',
@@ -52,8 +51,8 @@ class EditAdaptiveMediaConfig extends PortletBase {
 		const idOptions = this.one('#idOptions');
 
 		if (idOptions) {
-			dom.delegate(idOptions, 'change', 'input[type="radio"]', (event) =>
-				this.onChangeUuidOptions_(event.delegateTarget)
+			delegate(idOptions, 'change', 'input[type="radio"]', (event) =>
+				this.onChangeUuidOptions_(event.srcElement)
 			);
 		}
 

diff --git a/modules/apps/asset/asset-browser-web/src/main/resources/META-INF/resources/view.jsp b/modules/apps/asset/asset-browser-web/src/main/resources/META-INF/resources/view.jsp
@@ -258,8 +258,8 @@
 		</aui:script>
 	</c:when>
 	<c:otherwise>
-		<aui:script require="metal-dom/src/all/dom as dom">
-			var delegateHandler = dom.delegate(
+		<aui:script>
+			var delegateHandler = Liferay.Util.delegate(
 				document.querySelector('#<portlet:namespace />selectAssetFm'),
 				'click',
 				'.selector-button',
@@ -269,14 +269,14 @@
 					Liferay.Util.getOpener().Liferay.fire(
 						'<%= HtmlUtil.escapeJS(assetBrowserDisplayContext.getEventName()) %>',
 						{
-							data: event.delegateTarget.dataset,
+							data: event.srcElement.dataset,
 						}
 					);
 				}
 			);
 
 			var onDestroyPortlet = function () {
-				delegateHandler.removeListener();
+				delegateHandler.dispose();
 
 				Liferay.detach('destroyPortlet', onDestroyPortlet);
 			};

diff --git a/...et-display-page-item-selector-web/src/main/resources/META-INF/resources/display_pages.jsp b/...et-display-page-item-selector-web/src/main/resources/META-INF/resources/display_pages.jsp
@@ -54,7 +54,7 @@ AssetDisplayPagesItemSelectorViewDisplayContext assetDisplayPagesItemSelectorVie
 </aui:form>
 
 <aui:script require="metal-dom/src/all/dom as dom">
-	var selectFragmentEntryHandler = dom.delegate(
+	var selectFragmentEntryHandler = Liferay.Util.delegate(
 		document.querySelector('#<portlet:namespace />fm'),
 		'click',
 		'.layout-page-template-entry',
@@ -64,21 +64,21 @@ AssetDisplayPagesItemSelectorViewDisplayContext assetDisplayPagesItemSelectorVie
 				'active'
 			);
 			dom.addClasses(
-				dom.closest(event.delegateTarget, '.form-check-card'),
+				dom.closest(event.srcElement, '.form-check-card'),
 				'active'
 			);
 
 			Liferay.Util.getOpener().Liferay.fire(
 				'<%= assetDisplayPagesItemSelectorViewDisplayContext.getItemSelectedEventName() %>',
 				{
-					data: event.delegateTarget.dataset,
+					data: event.srcElement.dataset,
 				}
 			);
 		}
 	);
 
 	function removeListener() {
-		selectFragmentEntryHandler.removeListener();
+		selectFragmentEntryHandler.dispose();
 
 		Liferay.detach('destroyPortlet', removeListener);
 	}

diff --git a/...set/asset-list-web/src/main/resources/META-INF/resources/edit_asset_list_entry_manual.jsp b/...set/asset-list-web/src/main/resources/META-INF/resources/edit_asset_list_entry_manual.jsp
@@ -211,15 +211,15 @@ AssetListEntry assetListEntry = assetListDisplayContext.getAssetListEntry();
 	</c:otherwise>
 </c:choose>
 
-<aui:script require="metal-dom/src/dom as dom">
-	var delegateHandler = dom.delegate(
+<aui:script>
+	var delegateHandler = Liferay.Util.delegate(
 		document.body,
 		'click',
 		'.asset-selector a',
 		function (event) {
 			event.preventDefault();
 
-			var delegateTarget = event.delegateTarget;
+			var delegateTarget = event.srcElement;
 
 			Liferay.Util.openSelectionModal({
 				multiple: true,
@@ -248,7 +248,7 @@ AssetListEntry assetListEntry = assetListDisplayContext.getAssetListEntry();
 	);
 
 	var onDestroyPortlet = function () {
-		delegateHandler.removeListener();
+		delegateHandler.dispose();
 
 		Liferay.detach('destroyPortlet', onDestroyPortlet);
 	};