From 71105de59a5a8cdaaf271f59f9e876ecea3d0a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kre=C5=A1imir=20=C4=8Coko?= Date: Fri, 6 May 2022 09:35:11 +0200 Subject: [PATCH 1/3] LPS-152229 Modernize listSelect --- .../META-INF/resources/liferay/util.js | 3 ++ .../resources/META-INF/resources/index.es.js | 1 + .../META-INF/resources/liferay/global.es.js | 3 ++ .../META-INF/resources/liferay/liferay.d.ts | 5 +++ .../util/get_selected_option_values.js | 33 +++++++++++++++++++ 5 files changed, 45 insertions(+) create mode 100644 modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/util/get_selected_option_values.js diff --git a/modules/apps/frontend-js/frontend-js-aui-web/src/main/resources/META-INF/resources/liferay/util.js b/modules/apps/frontend-js/frontend-js-aui-web/src/main/resources/META-INF/resources/liferay/util.js index 8eb7343ade1a05..cc43ff728d0a8d 100644 --- a/modules/apps/frontend-js/frontend-js-aui-web/src/main/resources/META-INF/resources/liferay/util.js +++ b/modules/apps/frontend-js/frontend-js-aui-web/src/main/resources/META-INF/resources/liferay/util.js @@ -489,6 +489,9 @@ return Util.listCheckboxesExcept(form, except, name, true); }, + /** + * @deprecated As of Cavanaugh (7.4.x), replaced by `import {getSelectedOptionValues} from 'frontend-js-web';` + */ listSelect(select, delimeter) { select = Util.getElement(select); diff --git a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/index.es.js b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/index.es.js index f2c70ff7e50a64..71b6e9d86b34c8 100644 --- a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/index.es.js +++ b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/index.es.js @@ -105,6 +105,7 @@ export {default as inBrowserView} from './liferay/util/in_browser_view'; export {default as isObject} from './liferay/util/is_object'; export {default as isPhone} from './liferay/util/is_phone'; export {default as isTablet} from './liferay/util/is_tablet'; +export {default as getSelectedOptionValues} from './liferay/util/get_selected_option_values'; export {default as navigate} from './liferay/util/navigate.es'; export {default as normalizeFriendlyURL} from './liferay/util/normalize_friendly_url'; export {default as removeEntitySelection} from './liferay/util/remove_entity_selection'; diff --git a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/global.es.js b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/global.es.js index d00baba410e4b6..fb3ca90717cb47 100644 --- a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/global.es.js +++ b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/global.es.js @@ -61,6 +61,7 @@ import getLexiconIconTpl from './util/get_lexicon_icon_template'; import getOpener from './util/get_opener'; import getPortletId from './util/get_portlet_id'; import getPortletNamespace from './util/get_portlet_namespace.es'; +import getSelectedOptionValues from './util/get_selected_option_values'; import getTop from './util/get_top'; import getURLWithSessionId from './util/get_url_with_session_id'; import getWindow from './util/get_window'; @@ -251,6 +252,8 @@ Liferay.Util.isPhone = isPhone; */ Liferay.Util.isTablet = isTablet; +Liferay.Util.getSelectedOptionValues = getSelectedOptionValues; + Liferay.Util.navigate = navigate; Liferay.Util.ns = ns; Liferay.Util.objectToFormData = objectToFormData; diff --git a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/liferay.d.ts b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/liferay.d.ts index e0d642bcf23063..0de98efb2be632 100644 --- a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/liferay.d.ts +++ b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/liferay.d.ts @@ -349,6 +349,11 @@ declare module Liferay { export function getWindow(windowId?: string): Window; + export function getSelectedOptionValues( + select: HTMLSelectElement, + delimiter?: string + ): string; + /** * Performs navigation to the given url. If SPA is enabled, it will route the * request through the SPA engine. If not, it will simple change the document diff --git a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/util/get_selected_option_values.js b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/util/get_selected_option_values.js new file mode 100644 index 00000000000000..dc3321865ae81a --- /dev/null +++ b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/util/get_selected_option_values.js @@ -0,0 +1,33 @@ +/** + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +export default function getSelectedOptionValues(select, delimiter = ',') { + const optionsArray = Array.from(select.getElementsByTagName('option')); + + if (!optionsArray.length) { + return; + } + + return optionsArray + .reduce((previous, item) => { + const {value} = item; + + if (value) { + previous.push(value); + } + + return previous; + }, []) + .join(delimiter); +} From 813eb54100ccb454540af4c56e4a59ae2abb9034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kre=C5=A1imir=20=C4=8Coko?= Date: Fri, 6 May 2022 09:40:48 +0200 Subject: [PATCH 2/3] LPS-152229 Replace usages of listSelect with getSelectedOptionValues --- .../META-INF/resources/announcements/configuration.jsp | 10 ++++++---- .../resources/META-INF/resources/configuration.jsp | 2 +- .../META-INF/resources/edit_asset_list_entry.jsp | 4 ++-- .../resources/META-INF/resources/configuration.jsp | 8 ++++---- .../resources/bookmarks_admin/configuration.jsp | 8 ++++++-- .../resources/edit_content_dashboard_configuration.jsp | 2 +- .../resources/document_library/configuration.jsp | 4 ++-- .../resources/image_gallery_display/configuration.jsp | 2 +- .../resources/META-INF/resources/configuration.jsp | 2 +- .../resources/facets/configuration/asset_entries.jsp | 2 +- .../META-INF/resources/type/facet/configuration.jsp | 2 +- .../src/main/resources/META-INF/resources/language.jsp | 2 +- .../resources/META-INF/resources/configuration.jsp | 4 +++- .../META-INF/resources/bookmarks_settings/page.jsp | 4 ++-- .../META-INF/resources/wiki/configuration.jsp | 8 ++++++-- 15 files changed, 38 insertions(+), 26 deletions(-) diff --git a/modules/apps/announcements/announcements-web/src/main/resources/META-INF/resources/announcements/configuration.jsp b/modules/apps/announcements/announcements-web/src/main/resources/META-INF/resources/announcements/configuration.jsp index e7d7fedda51365..c95ea6caea50e0 100644 --- a/modules/apps/announcements/announcements-web/src/main/resources/META-INF/resources/announcements/configuration.jsp +++ b/modules/apps/announcements/announcements-web/src/main/resources/META-INF/resources/announcements/configuration.jsp @@ -371,7 +371,7 @@ announcementsPortletInstanceConfiguration = ParameterMapUtil.setParameterMap(Ann if (currentScopeGroupIds && selectedScopeGroupIds) { selectedScopeGroupIds.setAttribute( 'value', - Liferay.Util.listSelect(currentScopeGroupIds) + Liferay.Util.getSelectedOptionValues(currentScopeGroupIds) ); } @@ -385,7 +385,9 @@ announcementsPortletInstanceConfiguration = ParameterMapUtil.setParameterMap(Ann if (currentScopeOrganizationIds && selectedScopeOrganizationIds) { selectedScopeOrganizationIds.setAttribute( 'value', - Liferay.Util.listSelect(currentScopeOrganizationIds) + Liferay.Util.getSelectedOptionValues( + currentScopeOrganizationIds + ) ); } @@ -399,7 +401,7 @@ announcementsPortletInstanceConfiguration = ParameterMapUtil.setParameterMap(Ann if (currentScopeRoleIds && selectedScopeRoleIds) { selectedScopeRoleIds.setAttribute( 'value', - Liferay.Util.listSelect(currentScopeRoleIds) + Liferay.Util.getSelectedOptionValues(currentScopeRoleIds) ); } @@ -413,7 +415,7 @@ announcementsPortletInstanceConfiguration = ParameterMapUtil.setParameterMap(Ann if (currentScopeUserGroupIds && selectedScopeUserGroupIds) { selectedScopeUserGroupIds.setAttribute( 'value', - Liferay.Util.listSelect(currentScopeUserGroupIds) + Liferay.Util.getSelectedOptionValues(currentScopeUserGroupIds) ); } diff --git a/modules/apps/asset/asset-categories-navigation-web/src/main/resources/META-INF/resources/configuration.jsp b/modules/apps/asset/asset-categories-navigation-web/src/main/resources/META-INF/resources/configuration.jsp index 46d566db8c25b2..664f70ccc43253 100644 --- a/modules/apps/asset/asset-categories-navigation-web/src/main/resources/META-INF/resources/configuration.jsp +++ b/modules/apps/asset/asset-categories-navigation-web/src/main/resources/META-INF/resources/configuration.jsp @@ -77,7 +77,7 @@ Liferay.Util.postForm(form, { data: { - assetVocabularyIds: Liferay.Util.listSelect( + assetVocabularyIds: Liferay.Util.getSelectedOptionValues( Liferay.Util.getFormElement(form, 'currentAssetVocabularyIds') ), }, diff --git a/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/edit_asset_list_entry.jsp b/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/edit_asset_list_entry.jsp index 4e68b5e4971060..991ec8770db731 100644 --- a/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/edit_asset_list_entry.jsp +++ b/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/edit_asset_list_entry.jsp @@ -111,7 +111,7 @@ renderResponse.setTitle(assetListDisplayContext.getAssetListEntryTitle()); %> Liferay.Util.setFormValues(form, { - classTypeIds<%= className %>: Liferay.Util.listSelect( + classTypeIds<%= className %>: Liferay.Util.getSelectedOptionValues( Liferay.Util.getFormElement( form, '<%= className %>currentClassTypeIds' @@ -131,7 +131,7 @@ renderResponse.setTitle(assetListDisplayContext.getAssetListEntryTitle()); if (currentClassNameIdsSelect) { Liferay.Util.postForm(form, { data: { - classNameIds: Liferay.Util.listSelect( + classNameIds: Liferay.Util.getSelectedOptionValues( currentClassNameIdsSelect ), }, diff --git a/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/configuration.jsp b/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/configuration.jsp index 972bccaec66439..4b6c40673379e9 100644 --- a/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/configuration.jsp +++ b/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/configuration.jsp @@ -74,7 +74,7 @@ List> classTypesAssetRendererFactories = new ArrayList<> %> Liferay.Util.setFormValues(form, { - classTypeIds<%= className %>: Liferay.Util.listSelect( + classTypeIds<%= className %>: Liferay.Util.getSelectedOptionValues( Liferay.Util.getFormElement( form, '<%= className %>currentClassTypeIds' @@ -98,10 +98,10 @@ List> classTypesAssetRendererFactories = new ArrayList<> if (currentClassNameIdsSelect && currentMetadataFieldsInput) { Liferay.Util.postForm(form, { data: { - classNameIds: Liferay.Util.listSelect( + classNameIds: Liferay.Util.getSelectedOptionValues( currentClassNameIdsSelect ), - metadataFields: Liferay.Util.listSelect( + metadataFields: Liferay.Util.getSelectedOptionValues( currentMetadataFieldsInput ), }, @@ -110,7 +110,7 @@ List> classTypesAssetRendererFactories = new ArrayList<> else if (currentMetadataFieldsInput) { Liferay.Util.postForm(form, { data: { - metadataFields: Liferay.Util.listSelect( + metadataFields: Liferay.Util.getSelectedOptionValues( currentMetadataFieldsInput ), }, diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/resources/META-INF/resources/bookmarks_admin/configuration.jsp b/modules/apps/bookmarks/bookmarks-web/src/main/resources/META-INF/resources/bookmarks_admin/configuration.jsp index 25c4e02187d1b7..a10d9045f91234 100644 --- a/modules/apps/bookmarks/bookmarks-web/src/main/resources/META-INF/resources/bookmarks_admin/configuration.jsp +++ b/modules/apps/bookmarks/bookmarks-web/src/main/resources/META-INF/resources/bookmarks_admin/configuration.jsp @@ -276,7 +276,9 @@ catch (NoSuchFolderException nsfe) { ); if (currentFolderColumns && folderColumns) { - folderColumns.value = Util.listSelect(currentFolderColumns); + folderColumns.value = Util.getSelectedOptionValues( + currentFolderColumns + ); } var currentEntryColumns = form.querySelector( @@ -287,7 +289,9 @@ catch (NoSuchFolderException nsfe) { ); if (currentEntryColumns && entryColumns) { - entryColumns.value = Util.listSelect(currentEntryColumns); + entryColumns.value = Util.getSelectedOptionValues( + currentEntryColumns + ); } submitForm(form); diff --git a/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/edit_content_dashboard_configuration.jsp b/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/edit_content_dashboard_configuration.jsp index 19ee3033584984..bd5ca33d9ee2b6 100644 --- a/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/edit_content_dashboard_configuration.jsp +++ b/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/edit_content_dashboard_configuration.jsp @@ -90,7 +90,7 @@ ContentDashboardAdminConfigurationDisplayContext contentDashboardAdminConfigurat var form = document.fm; Liferay.Util.postForm(form, { data: { - assetVocabularyIds: Liferay.Util.listSelect( + assetVocabularyIds: Liferay.Util.getSelectedOptionValues( Liferay.Util.getFormElement(form, 'currentAssetVocabularyIds') ), }, diff --git a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/configuration.jsp b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/configuration.jsp index 95b99b418d59a8..3ffec71d8fceff 100644 --- a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/configuration.jsp +++ b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/configuration.jsp @@ -246,10 +246,10 @@ DLPortletInstanceSettingsHelper dlPortletInstanceSettingsHelper = new DLPortletI Util.postForm(form, { data: { - displayViews: Util.listSelect( + displayViews: Util.getSelectedOptionValues( Util.getFormElement(form, 'currentDisplayViews') ), - entryColumns: Util.listSelect( + entryColumns: Util.getSelectedOptionValues( Util.getFormElement(form, 'currentEntryColumns') ), }, diff --git a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/image_gallery_display/configuration.jsp b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/image_gallery_display/configuration.jsp index cc5d2990eed153..fdcedddb6c9044 100644 --- a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/image_gallery_display/configuration.jsp +++ b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/image_gallery_display/configuration.jsp @@ -164,7 +164,7 @@ IGConfigurationDisplayContext igConfigurationDisplayContext = (IGConfigurationDi Liferay.Util.postForm(form, { data: { - mimeTypes: Liferay.Util.listSelect( + mimeTypes: Liferay.Util.getSelectedOptionValues( Liferay.Util.getFormElement(form, 'currentMimeTypes') ), }, diff --git a/modules/apps/portal-rules-engine/portal-rules-engine-sample-web/src/main/resources/META-INF/resources/configuration.jsp b/modules/apps/portal-rules-engine/portal-rules-engine-sample-web/src/main/resources/META-INF/resources/configuration.jsp index 0128589d2285b9..6586328523c25f 100644 --- a/modules/apps/portal-rules-engine/portal-rules-engine-sample-web/src/main/resources/META-INF/resources/configuration.jsp +++ b/modules/apps/portal-rules-engine/portal-rules-engine-sample-web/src/main/resources/META-INF/resources/configuration.jsp @@ -97,7 +97,7 @@ long[] classNameIdValues = StringUtil.split(ParamUtil.getString(request, "classN if (classNameIds && currentClassNameIds) { classNameIds.setAttribute( 'value', - Liferay.Util.listSelect(currentClassNameIds) + Liferay.Util.getSelectedOptionValues(currentClassNameIds) ); } diff --git a/modules/apps/portal-search/portal-search-web/src/main/resources/META-INF/resources/facets/configuration/asset_entries.jsp b/modules/apps/portal-search/portal-search-web/src/main/resources/META-INF/resources/facets/configuration/asset_entries.jsp index 3541d4e6262903..66a5a53fbae91a 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/resources/META-INF/resources/facets/configuration/asset_entries.jsp +++ b/modules/apps/portal-search/portal-search-web/src/main/resources/META-INF/resources/facets/configuration/asset_entries.jsp @@ -76,7 +76,7 @@ for (AssetRendererFactory assetRendererFactory : assetEntriesSearchFacet.getA data[ '<%= assetEntriesSearchFacet.getClassName() + "assetTypes" %>' - ] = Liferay.Util.listSelect(currentAssetTypes); + ] = Liferay.Util.getSelectedOptionValues(currentAssetTypes); Liferay.Util.postForm(form, {data: data}); }); diff --git a/modules/apps/portal-search/portal-search-web/src/main/resources/META-INF/resources/type/facet/configuration.jsp b/modules/apps/portal-search/portal-search-web/src/main/resources/META-INF/resources/type/facet/configuration.jsp index f7895f349b76e1..9d9938995e1738 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/resources/META-INF/resources/type/facet/configuration.jsp +++ b/modules/apps/portal-search/portal-search-web/src/main/resources/META-INF/resources/type/facet/configuration.jsp @@ -124,7 +124,7 @@ TypeFacetPortletPreferences typeFacetPortletPreferences = new com.liferay.portal data[ '<%= PortletPreferencesJspUtil.getInputName(TypeFacetPortletPreferences.PREFERENCE_KEY_ASSET_TYPES) %>' - ] = Liferay.Util.listSelect(currentAssetTypes); + ] = Liferay.Util.getSelectedOptionValues(currentAssetTypes); Liferay.Util.postForm(form, {data: data}); }); diff --git a/modules/apps/portal-settings/portal-settings-web/src/main/resources/META-INF/resources/language.jsp b/modules/apps/portal-settings/portal-settings-web/src/main/resources/META-INF/resources/language.jsp index c178c35ecf833d..dbbe3c83ba65d2 100644 --- a/modules/apps/portal-settings/portal-settings-web/src/main/resources/META-INF/resources/language.jsp +++ b/modules/apps/portal-settings/portal-settings-web/src/main/resources/META-INF/resources/language.jsp @@ -137,7 +137,7 @@ if (currentLanguageIdsElement) { Liferay.Util.setFormValues(form, { - <%= PropsKeys.LOCALES %>: Liferay.Util.listSelect( + <%= PropsKeys.LOCALES %>: Liferay.Util.getSelectedOptionValues( currentLanguageIdsElement ), }); diff --git a/modules/apps/site-navigation/site-navigation-language-web/src/main/resources/META-INF/resources/configuration.jsp b/modules/apps/site-navigation/site-navigation-language-web/src/main/resources/META-INF/resources/configuration.jsp index f2288f606414ef..87c465f5ab7ba0 100644 --- a/modules/apps/site-navigation/site-navigation-language-web/src/main/resources/META-INF/resources/configuration.jsp +++ b/modules/apps/site-navigation/site-navigation-language-web/src/main/resources/META-INF/resources/configuration.jsp @@ -87,7 +87,9 @@ if (currentLanguageIdsInput) { Liferay.Util.postForm(form, { data: { - languageIds: Liferay.Util.listSelect(currentLanguageIdsInput), + languageIds: Liferay.Util.getSelectedOptionValues( + currentLanguageIdsInput + ), }, }); } diff --git a/modules/apps/social/social-bookmarks-taglib/src/main/resources/META-INF/resources/bookmarks_settings/page.jsp b/modules/apps/social/social-bookmarks-taglib/src/main/resources/META-INF/resources/bookmarks_settings/page.jsp index b77c13908899f7..74079150cd0d95 100644 --- a/modules/apps/social/social-bookmarks-taglib/src/main/resources/META-INF/resources/bookmarks_settings/page.jsp +++ b/modules/apps/social/social-bookmarks-taglib/src/main/resources/META-INF/resources/bookmarks_settings/page.jsp @@ -97,11 +97,11 @@ rightList = ListUtil.sort(rightList, new KeyValuePairComparator(false, true)); ); Liferay.after('inputmoveboxes:moveItem', (event) => { - socialBookmarksTypes.value = Util.listSelect(currentTypes); + socialBookmarksTypes.value = Util.getSelectedOptionValues(currentTypes); }); Liferay.after('inputmoveboxes:orderItem', (event) => { - socialBookmarksTypes.value = Util.listSelect(currentTypes); + socialBookmarksTypes.value = Util.getSelectedOptionValues(currentTypes); }); })(); \ No newline at end of file diff --git a/modules/apps/wiki/wiki-web/src/main/resources/META-INF/resources/wiki/configuration.jsp b/modules/apps/wiki/wiki-web/src/main/resources/META-INF/resources/wiki/configuration.jsp index e6463747a0a5f4..a59c9e5a04129f 100644 --- a/modules/apps/wiki/wiki-web/src/main/resources/META-INF/resources/wiki/configuration.jsp +++ b/modules/apps/wiki/wiki-web/src/main/resources/META-INF/resources/wiki/configuration.jsp @@ -141,8 +141,12 @@ if (availableVisibleNodes && currentVisibleNodes) { Liferay.Util.postForm(form, { data: { - hiddenNodes: Liferay.Util.listSelect(availableVisibleNodes), - visibleNodes: Liferay.Util.listSelect(currentVisibleNodes), + hiddenNodes: Liferay.Util.getSelectedOptionValues( + availableVisibleNodes + ), + visibleNodes: Liferay.Util.getSelectedOptionValues( + currentVisibleNodes + ), }, }); } From 6e662df86bd77fd134a4875959bb747d8c94f87d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kre=C5=A1imir=20=C4=8Coko?= Date: Thu, 12 May 2022 11:56:46 +0200 Subject: [PATCH 3/3] LPS-152229 Remove the empty return that introduced a bug --- .../resources/liferay/util/get_selected_option_values.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/util/get_selected_option_values.js b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/util/get_selected_option_values.js index dc3321865ae81a..7eb434465a7bd4 100644 --- a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/util/get_selected_option_values.js +++ b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/util/get_selected_option_values.js @@ -15,10 +15,6 @@ export default function getSelectedOptionValues(select, delimiter = ',') { const optionsArray = Array.from(select.getElementsByTagName('option')); - if (!optionsArray.length) { - return; - } - return optionsArray .reduce((previous, item) => { const {value} = item;