Skip to content

Commit

Permalink
LPS-122449 Remove {delegate} usages of metal-dom pt. 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@kresimir-coko
kresimir-coko committed Nov 3, 2020
1 parent da0522d commit 7d86fe8
Show file tree
Hide file tree
Showing 13 changed files with 54 additions and 58 deletions.
3 changes: 1 addition & 2 deletions ...web/src/main/resources/META-INF/resources/adaptive_media/js/EditAdaptiveMediaConfig.es.js
View file
Expand Up @@ -43,7 +43,6 @@ const VALID_INPUT_KEYS = new Set([
*/

class EditAdaptiveMediaConfig extends PortletBase {

/**
* @inheritDoc
*/
Expand All @@ -52,7 +51,7 @@ class EditAdaptiveMediaConfig extends PortletBase {

if (idOptions) {
delegate(idOptions, 'change', 'input[type="radio"]', (event) =>
this.onChangeUuidOptions_(event.srcElement)
this.onChangeUuidOptions_(event.target)
);
}

Expand Down
6 changes: 3 additions & 3 deletions modules/apps/asset/asset-browser-web/src/main/resources/META-INF/resources/view.jsp
View file
Expand Up @@ -258,8 +258,8 @@
</aui:script>
</c:when>
<c:otherwise>
<aui:script>
var delegateHandler = Liferay.Util.delegate(
<aui:script require="frontend-js-web/liferay/delegate/delegate.es as delegate">
var delegateHandler = delegate.default(
document.querySelector('#<portlet:namespace />selectAssetFm'),
'click',
'.selector-button',
Expand All @@ -269,7 +269,7 @@
Liferay.Util.getOpener().Liferay.fire(
'<%= HtmlUtil.escapeJS(assetBrowserDisplayContext.getEventName()) %>',
{
data: event.srcElement.dataset,
data: event.target.dataset,
}
);
}
Expand Down
8 changes: 4 additions & 4 deletions ...et-display-page-item-selector-web/src/main/resources/META-INF/resources/display_pages.jsp
View file
Expand Up @@ -53,8 +53,8 @@ AssetDisplayPagesItemSelectorViewDisplayContext assetDisplayPagesItemSelectorVie
</liferay-ui:search-container>
</aui:form>

<aui:script require="metal-dom/src/all/dom as dom">
var selectFragmentEntryHandler = Liferay.Util.delegate(
<aui:script require="metal-dom/src/all/dom as dom,frontend-js-web/liferay/delegate/delegate.es as delegate">
var selectFragmentEntryHandler = delegate.default(
document.querySelector('#<portlet:namespace />fm'),
'click',
'.layout-page-template-entry',
Expand All @@ -64,14 +64,14 @@ AssetDisplayPagesItemSelectorViewDisplayContext assetDisplayPagesItemSelectorVie
'active'
);
dom.addClasses(
dom.closest(event.srcElement, '.form-check-card'),
dom.closest(event.target, '.form-check-card'),
'active'
);

Liferay.Util.getOpener().Liferay.fire(
'<%= assetDisplayPagesItemSelectorViewDisplayContext.getItemSelectedEventName() %>',
{
data: event.srcElement.dataset,
data: event.target.dataset,
}
);
}
Expand Down
14 changes: 7 additions & 7 deletions ...les/apps/asset/asset-list-web/src/main/resources/META-INF/resources/asset_list/source.jsp
View file
Expand Up @@ -245,7 +245,7 @@ List<AssetRendererFactory<?>> classTypesAssetRendererFactories = new ArrayList<>
</liferay-frontend:fieldset>
</liferay-frontend:fieldset-group>

<aui:script require="metal-dom/src/dom as dom">
<aui:script require="metal-dom/src/dom as dom,frontend-js-web/liferay/delegate/delegate.es as delegate">
var Util = Liferay.Util;

var MAP_DDM_STRUCTURES = {};
Expand Down Expand Up @@ -542,12 +542,12 @@ List<AssetRendererFactory<?>> classTypesAssetRendererFactories = new ArrayList<>
});
}

dom.delegate(
delegate.default(
sourcePanel,
'click',
'.asset-subtypefields-wrapper-enable label',
function (event) {
var subtypeFieldsFilterEnabledInput = event.delegateTarget.querySelector(
var subtypeFieldsFilterEnabledInput = event.target.querySelector(
'input'
);

Expand Down Expand Up @@ -583,12 +583,12 @@ List<AssetRendererFactory<?>> classTypesAssetRendererFactories = new ArrayList<>
'<portlet:namespace />ddmStructureDisplayFieldValue'
);

dom.delegate(sourcePanel, 'click', '.asset-subtypefields-popup', function (
delegate.default(sourcePanel, 'click', '.asset-subtypefields-popup', function (
event
) {
var delegateTarget = event.delegateTarget;
var target = event.target;

var btn = delegateTarget.querySelector('.btn');
var btn = target.querySelector('.btn');

var url = btn.dataset.href;

Expand All @@ -610,7 +610,7 @@ List<AssetRendererFactory<?>> classTypesAssetRendererFactories = new ArrayList<>

Util.openSelectionModal({
customSelectEvent: true,
id: '<portlet:namespace />selectDDMStructure' + delegateTarget.id,
id: '<portlet:namespace />selectDDMStructure' + target.id,
onSelect: function (selectedItem) {
setDDMFields(
selectedItem.className,
Expand Down
10 changes: 5 additions & 5 deletions ...set/asset-list-web/src/main/resources/META-INF/resources/edit_asset_list_entry_manual.jsp
View file
Expand Up @@ -211,15 +211,15 @@ AssetListEntry assetListEntry = assetListDisplayContext.getAssetListEntry();
</c:otherwise>
</c:choose>

<aui:script>
var delegateHandler = Liferay.Util.delegate(
<aui:script require="frontend-js-web/liferay/delegate/delegate.es as delegate">
var delegateHandler = delegate.default(
document.body,
'click',
'.asset-selector a',
function (event) {
event.preventDefault();

var delegateTarget = event.srcElement;
var target = event.target;

Liferay.Util.openSelectionModal({
multiple: true,
Expand All @@ -241,8 +241,8 @@ AssetListEntry assetListEntry = assetListDisplayContext.getAssetListEntry();
}
},
selectEventName: '<portlet:namespace />selectAsset',
title: delegateTarget.dataset.title,
url: delegateTarget.dataset.href,
title: target.dataset.title,
url: target.dataset.href,
});
}
);
Expand Down
13 changes: 5 additions & 8 deletions ...s/asset/asset-list-web/src/main/resources/META-INF/resources/js/TopLinkEventHandler.es.js
View file
Expand Up @@ -12,30 +12,27 @@
* details.
*/

import {PortletBase} from 'frontend-js-web';
import dom from 'metal-dom';
import {PortletBase, delegate} from 'frontend-js-web';

export default class TopLinkEventHandler extends PortletBase {
attached() {
this._delegateHandler = dom.delegate(
this._delegateHandler = delegate(
document.body,
'click',
'a',
(event) => {
const openerWindow = Liferay.Util.getTop();

if (openerWindow && event.delegateTarget.target === '_top') {
if (openerWindow && event.target.target === '_top') {
event.preventDefault();

openerWindow.Liferay.Util.navigate(
event.delegateTarget.href
);
openerWindow.Liferay.Util.navigate(event.target.href);
}
}
);
}

dispose() {
this._delegateHandler.removeListener();
this._delegateHandler.dispose();
}
}
12 changes: 6 additions & 6 deletions ...asset-publisher-web/src/main/resources/META-INF/resources/configuration/asset_entries.jsp
View file
Expand Up @@ -225,7 +225,7 @@ for (long groupId : groupIds) {
}
</script>

<aui:script require="metal-dom/src/dom as dom">
<aui:script require="metal-dom/src/dom as dom,frontend-js-web/liferay/delegate/delegate.es as delegate">
function selectAssets(assetEntryList) {
var assetClassName = '';
var assetEntryIds = [];
Expand All @@ -246,14 +246,14 @@ for (long groupId : groupIds) {
});
}

var delegateHandler = dom.delegate(
var delegateHandler = delegate.default(
document.body,
'click',
'.asset-selector a',
function (event) {
event.preventDefault();

var delegateTarget = event.delegateTarget;
var target = event.target;

Liferay.Util.openSelectionModal({
multiple: true,
Expand All @@ -263,14 +263,14 @@ for (long groupId : groupIds) {
}
},
selectEventName: '<%= eventName %>',
title: delegateTarget.dataset.title,
url: delegateTarget.dataset.href,
title: target.dataset.title,
url: target.dataset.href,
});
}
);

function handleDestroyPortlet() {
delegateHandler.removeListener();
delegateHandler.dispose();

Liferay.detach('destroyPortlet', handleDestroyPortlet);
}
Expand Down
6 changes: 3 additions & 3 deletions ...t-publisher-web/src/main/resources/META-INF/resources/configuration/create_asset_list.jsp
View file
Expand Up @@ -26,7 +26,7 @@ String portletResource = ParamUtil.getString(request, "portletResource");
</aui:a>
</div>

<aui:script require="metal-dom/src/all/dom as dom,frontend-js-web/liferay/modal/commands/OpenSimpleInputModal.es as openSimpleInputModal">
<aui:script require="frontend-js-web/liferay/modal/commands/OpenSimpleInputModal.es as openSimpleInputModal,frontend-js-web/liferay/delegate/delegate.es as delegate">
function handleCreateAssetListLinkClick(event) {
event.preventDefault();

Expand All @@ -43,15 +43,15 @@ String portletResource = ParamUtil.getString(request, "portletResource");
});
}

var createAssetListLinkClickHandler = dom.delegate(
var createAssetListLinkClickHandler = delegate.default(
document.body,
'click',
'a.create-collection-link',
handleCreateAssetListLinkClick
);

function handleDestroyPortlet() {
createAssetListLinkClickHandler.removeListener();
createAssetListLinkClickHandler.dispose();

Liferay.detach('destroyPortlet', handleDestroyPortlet);
}
Expand Down
14 changes: 7 additions & 7 deletions .../asset/asset-publisher-web/src/main/resources/META-INF/resources/configuration/source.jsp
View file
Expand Up @@ -221,7 +221,7 @@ List<AssetRendererFactory<?>> classTypesAssetRendererFactories = (List<AssetRend
</c:if>
</aui:fieldset>

<aui:script require="metal-dom/src/dom as dom">
<aui:script require="metal-dom/src/dom as dom,frontend-js-web/liferay/delegate/delegate.es as delegate">
var Util = Liferay.Util;

var MAP_DDM_STRUCTURES = {};
Expand Down Expand Up @@ -490,12 +490,12 @@ List<AssetRendererFactory<?>> classTypesAssetRendererFactories = (List<AssetRend
});
}

dom.delegate(
delegate.default(
sourcePanel,
'click',
'.asset-subtypefields-wrapper-enable label',
function (event) {
var subtypeFieldsFilterEnabledInput = event.delegateTarget.querySelector(
var subtypeFieldsFilterEnabledInput = event.target.querySelector(
'input'
);

Expand Down Expand Up @@ -531,12 +531,12 @@ List<AssetRendererFactory<?>> classTypesAssetRendererFactories = (List<AssetRend
'<portlet:namespace />ddmStructureDisplayFieldValue'
);

dom.delegate(sourcePanel, 'click', '.asset-subtypefields-popup', function (
delegate.default(sourcePanel, 'click', '.asset-subtypefields-popup', function (
event
) {
var delegateTarget = event.delegateTarget;
var target = event.target;

var btn = delegateTarget.querySelector('.btn');
var btn = target.querySelector('.btn');

var url = btn.dataset.href;

Expand All @@ -558,7 +558,7 @@ List<AssetRendererFactory<?>> classTypesAssetRendererFactories = (List<AssetRend

Util.openSelectionModal({
customSelectEvent: true,
id: '<portlet:namespace />selectDDMStructure' + delegateTarget.id,
id: '<portlet:namespace />selectDDMStructure' + target.id,
onSelect: function (selectedItem) {
setDDMFields(
selectedItem.className,
Expand Down
10 changes: 5 additions & 5 deletions .../apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_view_usages/page.jsp
View file
Expand Up @@ -73,25 +73,25 @@ AssetEntryUsagesDisplayContext assetEntryUsagesDisplayContext = new AssetEntryUs
</liferay-ui:search-container>
</div>

<aui:script require="metal-dom/src/all/dom as dom">
<aui:script require="frontend-js-web/liferay/delegate/delegate.es as delegate">
if (document.querySelector('#<portlet:namespace />assetEntryUsagesList')) {
var previewAssetEntryUsagesList = dom.delegate(
var previewAssetEntryUsagesList = delegate.default(
document.querySelector('#<portlet:namespace />assetEntryUsagesList'),
'click',
'.preview-asset-entry-usage',
function (event) {
var delegateTarget = event.delegateTarget;
var target = event.target;

Liferay.Util.openModal({
iframeBodyCssClass: 'article-preview',
title: '<liferay-ui:message key="preview" />',
url: delegateTarget.getAttribute('data-href'),
url: target.getAttribute('data-href'),
});
}
);

function removeListener() {
previewAssetEntryUsagesList.removeListener();
previewAssetEntryUsagesList.dispose();

Liferay.detach('destroyPortlet', removeListener);
}
Expand Down
4 changes: 2 additions & 2 deletions .../connected-app/connected-app-web/src/main/resources/META-INF/resources/connected_apps.jsp
View file
Expand Up @@ -85,12 +85,12 @@
</div>
</div>

<aui:script require="metal-dom/src/dom as dom">
<aui:script require="frontend-js-web/liferay/delegate/delegate.es as delegate">
var connectedAppKeyInput = document.querySelector(
'[name=<portlet:namespace />connectedAppKey]'
);

dom.delegate(
delegate.default(
document.getElementById('<portlet:namespace />connectedApp'),
'click',
'[data-key]',
Expand Down
6 changes: 3 additions & 3 deletions modules/apps/depot/depot-web/src/main/resources/META-INF/resources/select_depot_role.jsp
View file
Expand Up @@ -68,13 +68,13 @@ DepotAdminSelectRoleDisplayContext depotAdminSelectRoleDisplayContext = (DepotAd
/>
</liferay-ui:search-container>

<aui:script require="metal-dom/src/dom as dom">
<aui:script require="frontend-js-web/liferay/delegate/delegate.es as delegate">
var form = document.<portlet:namespace />selectDepotRoleFm;

dom.delegate(form, 'click', '.group-selector-button', function (event) {
delegate.default(form, 'click', '.group-selector-button', function (event) {
Liferay.Util.postForm(form, {
data: {
groupId: event.delegateTarget.dataset.groupid,
groupId: event.target.dataset.groupid,
},

url: '<%= step1.getSelectRolePortletURL() %>',
Expand Down
6 changes: 3 additions & 3 deletions .../resources/META-INF/resources/document_library/upload_multiple_file_entries_resources.jsp
View file
Expand Up @@ -216,16 +216,16 @@ else {
}
%>

<aui:script position="inline" require="metal-dom/src/all/dom as dom">
<aui:script position="inline" require="metal-dom/src/all/dom as dom,frontend-js-web/liferay/delegate/delegate.es as delegate">
var documentTypeMenuList = document.querySelector(
'#<portlet:namespace />documentTypeSelector .lfr-menu-list'
);

if (documentTypeMenuList) {
dom.delegate(documentTypeMenuList, 'click', 'li a', function (event) {
delegate.default(documentTypeMenuList, 'click', 'li a', function (event) {
event.preventDefault();

Liferay.Util.fetch(event.delegateTarget.getAttribute('href'))
Liferay.Util.fetch(event.target.getAttribute('href'))
.then(function (response) {
return response.text();
})
Expand Down

0 comments on commit 7d86fe8

Please sign in to comment.