eduardolundgren · jbalsas · May 7, 2013
diff --git 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
@@ -103,7 +103,7 @@
 							submitButton.on(
 								'click',
 								function(event) {
-									popUp.close();
+									popUp.hide();
 
 									var form = A.one('#<portlet:namespace />fm');
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -57,6 +57,6 @@ boolean copyListTemplates = ParamUtil.getBoolean(request, "copyListTemplates");
 	<aui:button-row>
 		<aui:button type="submit" value="copy" />
 
-		<aui:button onClick="Liferay.Util.getWindow().close();" value="close" />
+		<aui:button onClick="Liferay.Util.getWindow().hide();" value="close" />
 	</aui:button-row>
 </aui:form>
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
@@ -48,6 +48,6 @@ long templateId = BeanParamUtil.getLong(template, request, "templateId");
 	<aui:button-row>
 		<aui:button type="submit" value="copy" />
 
-		<aui:button onClick="Liferay.Util.getWindow().close();" value="close" />
+		<aui:button onClick="Liferay.Util.getWindow().hide();" value="close" />
 	</aui:button-row>
 </aui:form>
diff --git a/...web/docroot/html/portlet/dynamic_data_mapping/select_document_library_search_results.jspf b/...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
@@ -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
@@ -414,7 +414,7 @@ if (feed != null) {
 			document.<portlet:namespace />fm.<portlet:namespace />templateId.value = templateId;
 
 			if (dialog) {
-				dialog.close();
+				dialog.hide();
 			}
 
 			submitForm(document.<portlet:namespace />fm);

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -120,7 +120,7 @@ WorkflowTask workflowTask = (WorkflowTask)row.getObject();
 								label: '<%= UnicodeLanguageUtil.get(pageContext, "cancel") %>',
 								on: {
 									click: function() {
-										dialog.close();
+										dialog.hide();
 									}
 								}
 							}