diff --git a/portal-web/docroot/html/js/liferay/util.js b/portal-web/docroot/html/js/liferay/util.js index 8473c26af1358c..93f91cf54ed291 100644 --- a/portal-web/docroot/html/js/liferay/util.js +++ b/portal-web/docroot/html/js/liferay/util.js @@ -886,7 +886,7 @@ function() { detachEventHandles(); - dialog.close(); + dialog.hide(); } ); } @@ -1999,7 +1999,7 @@ } } - dialog.close(); + dialog.hide(); } } ); diff --git a/portal-web/docroot/html/portal/layout/edit/portlet.jsp b/portal-web/docroot/html/portal/layout/edit/portlet.jsp index 6b0a257f977ac3..450d354dd3734e 100644 --- a/portal-web/docroot/html/portal/layout/edit/portlet.jsp +++ b/portal-web/docroot/html/portal/layout/edit/portlet.jsp @@ -103,7 +103,7 @@ submitButton.on( 'click', function(event) { - popUp.close(); + popUp.hide(); var form = A.one('#fm'); diff --git a/portal-web/docroot/html/portlet/asset_browser/view.jsp b/portal-web/docroot/html/portlet/asset_browser/view.jsp index 46b6483a81de94..c195b2de714f65 100644 --- a/portal-web/docroot/html/portlet/asset_browser/view.jsp +++ b/portal-web/docroot/html/portlet/asset_browser/view.jsp @@ -109,7 +109,7 @@ request.setAttribute("view.jsp-portletURL", portletURL); sb.append(HtmlUtil.escapeJS(assetEntry.getTitle(locale))); sb.append("', '"); sb.append(HtmlUtil.escapeJS(group.getDescriptiveName(locale))); - sb.append("');Liferay.Util.getWindow().close();"); + sb.append("');Liferay.Util.getWindow().hide();"); rowHREF = sb.toString(); } diff --git a/portal-web/docroot/html/portlet/asset_publisher/select_structure_field.jsp b/portal-web/docroot/html/portlet/asset_publisher/select_structure_field.jsp index 296ed59a11d1a1..c76503b72baf03 100644 --- a/portal-web/docroot/html/portlet/asset_publisher/select_structure_field.jsp +++ b/portal-web/docroot/html/portlet/asset_publisher/select_structure_field.jsp @@ -145,7 +145,7 @@ portletURL.setParameter("classTypeId", String.valueOf(classTypeId)); Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); } } } diff --git a/portal-web/docroot/html/portlet/bookmarks/select_folder.jsp b/portal-web/docroot/html/portlet/bookmarks/select_folder.jsp index adaaf5f19c4fbd..24af6ef9b77c2a 100644 --- a/portal-web/docroot/html/portlet/bookmarks/select_folder.jsp +++ b/portal-web/docroot/html/portlet/bookmarks/select_folder.jsp @@ -143,7 +143,7 @@ if (folder != null) { Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button' ); diff --git a/portal-web/docroot/html/portlet/document_library/edit_folder.jsp b/portal-web/docroot/html/portlet/document_library/edit_folder.jsp index 2a48a56b3b88b4..568d4e91f06b59 100644 --- a/portal-web/docroot/html/portlet/document_library/edit_folder.jsp +++ b/portal-web/docroot/html/portlet/document_library/edit_folder.jsp @@ -378,7 +378,7 @@ if (workflowEnabled) { select.append(option); if (dialog) { - dialog.close(); + dialog.hide(); } }, ['liferay-search-container'] diff --git a/portal-web/docroot/html/portlet/document_library/select_file_entry.jsp b/portal-web/docroot/html/portlet/document_library/select_file_entry.jsp index 2528c8be227822..84d2f90d066543 100644 --- a/portal-web/docroot/html/portlet/document_library/select_file_entry.jsp +++ b/portal-web/docroot/html/portlet/document_library/select_file_entry.jsp @@ -198,7 +198,7 @@ if (folder != null) { Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button input' ); diff --git a/portal-web/docroot/html/portlet/document_library/select_folder.jsp b/portal-web/docroot/html/portlet/document_library/select_folder.jsp index 7299d51dc8ae0b..07c118f88355d4 100644 --- a/portal-web/docroot/html/portlet/document_library/select_folder.jsp +++ b/portal-web/docroot/html/portlet/document_library/select_folder.jsp @@ -181,7 +181,7 @@ if (folder != null) { Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button input' ); diff --git a/portal-web/docroot/html/portlet/document_library/select_group.jsp b/portal-web/docroot/html/portlet/document_library/select_group.jsp index 337e213b639ef4..76dfa0f3a1db1b 100644 --- a/portal-web/docroot/html/portlet/document_library/select_group.jsp +++ b/portal-web/docroot/html/portlet/document_library/select_group.jsp @@ -122,7 +122,7 @@ String eventName = ParamUtil.getString(request, "eventName", liferayPortletRespo Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button input' ); diff --git a/portal-web/docroot/html/portlet/dynamic_data_mapping/copy_structure.jsp b/portal-web/docroot/html/portlet/dynamic_data_mapping/copy_structure.jsp index caab5ac3ab4a62..f16136dfa53eef 100644 --- a/portal-web/docroot/html/portlet/dynamic_data_mapping/copy_structure.jsp +++ b/portal-web/docroot/html/portlet/dynamic_data_mapping/copy_structure.jsp @@ -57,6 +57,6 @@ boolean copyListTemplates = ParamUtil.getBoolean(request, "copyListTemplates"); - + \ No newline at end of file diff --git a/portal-web/docroot/html/portlet/dynamic_data_mapping/copy_template.jsp b/portal-web/docroot/html/portlet/dynamic_data_mapping/copy_template.jsp index 4e37f4c4569645..9a50e23cfe8abc 100644 --- a/portal-web/docroot/html/portlet/dynamic_data_mapping/copy_template.jsp +++ b/portal-web/docroot/html/portlet/dynamic_data_mapping/copy_template.jsp @@ -48,6 +48,6 @@ long templateId = BeanParamUtil.getLong(template, request, "templateId"); - + \ No newline at end of file diff --git a/portal-web/docroot/html/portlet/dynamic_data_mapping/select_document_library_search_results.jspf b/portal-web/docroot/html/portlet/dynamic_data_mapping/select_document_library_search_results.jspf index 23ccd0e25761ae..47d19fd4f42531 100644 --- a/portal-web/docroot/html/portlet/dynamic_data_mapping/select_document_library_search_results.jspf +++ b/portal-web/docroot/html/portlet/dynamic_data_mapping/select_document_library_search_results.jspf @@ -66,7 +66,7 @@ for (int i = 0; i < results.size(); i++) { sb.append(HtmlUtil.escapeJS(fileEntry.getTitle())); sb.append("', '"); sb.append(fileEntry.getVersion()); - sb.append("'); Liferay.Util.getWindow().close();"); + sb.append("'); Liferay.Util.getWindow().hide();"); row.addButton("right", SearchEntry.DEFAULT_VALIGN, LanguageUtil.get(pageContext, "choose"), sb.toString()); diff --git a/portal-web/docroot/html/portlet/dynamic_data_mapping/select_template.jsp b/portal-web/docroot/html/portlet/dynamic_data_mapping/select_template.jsp index 86896269d6caa3..587374df9da04c 100644 --- a/portal-web/docroot/html/portlet/dynamic_data_mapping/select_template.jsp +++ b/portal-web/docroot/html/portlet/dynamic_data_mapping/select_template.jsp @@ -130,7 +130,7 @@ String title = ddmDisplay.getViewTemplatesTitle(structure, locale); Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button' ); diff --git a/portal-web/docroot/html/portlet/journal/edit_feed.jsp b/portal-web/docroot/html/portlet/journal/edit_feed.jsp index 6b83a44f4b0c43..c0e2eef226390b 100644 --- a/portal-web/docroot/html/portlet/journal/edit_feed.jsp +++ b/portal-web/docroot/html/portlet/journal/edit_feed.jsp @@ -414,7 +414,7 @@ if (feed != null) { document.fm.templateId.value = templateId; if (dialog) { - dialog.close(); + dialog.hide(); } submitForm(document.fm); diff --git a/portal-web/docroot/html/portlet/journal/js/main.js b/portal-web/docroot/html/portlet/journal/js/main.js index 9d2de4b692f0c9..81ba0548219ce7 100644 --- a/portal-web/docroot/html/portlet/journal/js/main.js +++ b/portal-web/docroot/html/portlet/journal/js/main.js @@ -679,7 +679,7 @@ AUI.add( label: Liferay.Language.get('cancel'), on: { click: function() { - instance._saveDialog.close(); + instance._saveDialog.hide(); } } } diff --git a/portal-web/docroot/html/portlet/journal/select_folder.jsp b/portal-web/docroot/html/portlet/journal/select_folder.jsp index 1ed6bcfba369ce..6b3455230f328a 100644 --- a/portal-web/docroot/html/portlet/journal/select_folder.jsp +++ b/portal-web/docroot/html/portlet/journal/select_folder.jsp @@ -165,7 +165,7 @@ if (folder != null) { Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button input' ); diff --git a/portal-web/docroot/html/portlet/layouts_admin/layout/mobile_rule_groups_toolbar.jspf b/portal-web/docroot/html/portlet/layouts_admin/layout/mobile_rule_groups_toolbar.jspf index 92e45cae6d4ede..f8c27470627e75 100644 --- a/portal-web/docroot/html/portlet/layouts_admin/layout/mobile_rule_groups_toolbar.jspf +++ b/portal-web/docroot/html/portlet/layouts_admin/layout/mobile_rule_groups_toolbar.jspf @@ -58,7 +58,7 @@ String toolbarItem = ParamUtil.getString(request, "toolbarItem", "add"); dialog.plug(A.LoadingMask).render(); } else { - dialog.close(); + dialog.hide(); } } }, diff --git a/portal-web/docroot/html/portlet/message_boards/select_category.jsp b/portal-web/docroot/html/portlet/message_boards/select_category.jsp index ab852110091896..9de291a4b0b6e9 100644 --- a/portal-web/docroot/html/portlet/message_boards/select_category.jsp +++ b/portal-web/docroot/html/portlet/message_boards/select_category.jsp @@ -146,7 +146,7 @@ else { Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button' ); diff --git a/portal-web/docroot/html/portlet/roles_admin/select_organization_role.jsp b/portal-web/docroot/html/portlet/roles_admin/select_organization_role.jsp index 5ad4d4f2b034e8..97b0108ae0fbb0 100644 --- a/portal-web/docroot/html/portlet/roles_admin/select_organization_role.jsp +++ b/portal-web/docroot/html/portlet/roles_admin/select_organization_role.jsp @@ -299,7 +299,7 @@ if (step == 1) { Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button input' ); diff --git a/portal-web/docroot/html/portlet/roles_admin/select_regular_role.jsp b/portal-web/docroot/html/portlet/roles_admin/select_regular_role.jsp index 16d983d3dc92b5..b1c907a274628c 100644 --- a/portal-web/docroot/html/portlet/roles_admin/select_regular_role.jsp +++ b/portal-web/docroot/html/portlet/roles_admin/select_regular_role.jsp @@ -119,7 +119,7 @@ portletURL.setParameter("eventName", eventName); Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button input' ); diff --git a/portal-web/docroot/html/portlet/roles_admin/select_site_role.jsp b/portal-web/docroot/html/portlet/roles_admin/select_site_role.jsp index b69f0ad34f7175..8cb4b17ad13759 100644 --- a/portal-web/docroot/html/portlet/roles_admin/select_site_role.jsp +++ b/portal-web/docroot/html/portlet/roles_admin/select_site_role.jsp @@ -251,7 +251,7 @@ if (step == 1) { Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button input' ); diff --git a/portal-web/docroot/html/portlet/site_browser/view.jsp b/portal-web/docroot/html/portlet/site_browser/view.jsp index e794a72f3f9f6c..7ef3eb1d60590f 100644 --- a/portal-web/docroot/html/portlet/site_browser/view.jsp +++ b/portal-web/docroot/html/portlet/site_browser/view.jsp @@ -176,7 +176,7 @@ portletURL.setParameter("target", target); sb.append(AssetPublisherUtil.getScopeId(group, scopeGroupId)); sb.append("', '"); sb.append(target); - sb.append("'); Liferay.Util.getWindow().close();"); + sb.append("'); Liferay.Util.getWindow().hide();"); rowHREF = sb.toString(); } diff --git a/portal-web/docroot/html/portlet/sites_admin/select_site.jsp b/portal-web/docroot/html/portlet/sites_admin/select_site.jsp index 0bf3dcc6cf9b19..22b92771761165 100644 --- a/portal-web/docroot/html/portlet/sites_admin/select_site.jsp +++ b/portal-web/docroot/html/portlet/sites_admin/select_site.jsp @@ -201,7 +201,7 @@ portletURL.setParameter("target", target); Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button input' ); diff --git a/portal-web/docroot/html/portlet/sites_admin/select_team.jsp b/portal-web/docroot/html/portlet/sites_admin/select_team.jsp index 64306f1c125ae9..957138e21eeac7 100644 --- a/portal-web/docroot/html/portlet/sites_admin/select_team.jsp +++ b/portal-web/docroot/html/portlet/sites_admin/select_team.jsp @@ -102,7 +102,7 @@ String eventName = ParamUtil.getString(request, "eventName", liferayPortletRespo Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button input' ); diff --git a/portal-web/docroot/html/portlet/user_groups_admin/select_user_group.jsp b/portal-web/docroot/html/portlet/user_groups_admin/select_user_group.jsp index a6a5e9c91cd9e0..ea70c04ff8080a 100644 --- a/portal-web/docroot/html/portlet/user_groups_admin/select_user_group.jsp +++ b/portal-web/docroot/html/portlet/user_groups_admin/select_user_group.jsp @@ -119,7 +119,7 @@ portletURL.setParameter("eventName", eventName); Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button input' ); diff --git a/portal-web/docroot/html/portlet/users_admin/select_organization.jsp b/portal-web/docroot/html/portlet/users_admin/select_organization.jsp index 97d6d8c0bee0b3..5908670f832071 100644 --- a/portal-web/docroot/html/portlet/users_admin/select_organization.jsp +++ b/portal-web/docroot/html/portlet/users_admin/select_organization.jsp @@ -164,7 +164,7 @@ if (Validator.isNotNull(target)) { Util.getOpener().Liferay.fire('<%= HtmlUtil.escapeJS(eventName) %>', result); - Util.getWindow().close(); + Util.getWindow().hide(); }, '.selector-button' ); diff --git a/portal-web/docroot/html/portlet/workflow_instances/workflow_task_action.jsp b/portal-web/docroot/html/portlet/workflow_instances/workflow_task_action.jsp index 35ac7e861bf099..a0ec397ce2eb6b 100644 --- a/portal-web/docroot/html/portlet/workflow_instances/workflow_task_action.jsp +++ b/portal-web/docroot/html/portlet/workflow_instances/workflow_task_action.jsp @@ -120,7 +120,7 @@ WorkflowTask workflowTask = (WorkflowTask)row.getObject(); label: '<%= UnicodeLanguageUtil.get(pageContext, "cancel") %>', on: { click: function() { - dialog.close(); + dialog.hide(); } } }