From b33b2fbb7cdc81517c004e5c07cc053b3d438ab0 Mon Sep 17 00:00:00 2001 From: Mike Hatfield Date: Wed, 11 Jul 2007 16:31:43 +0000 Subject: [PATCH] Fix for AWC-1331 - Double clicking on actions in the document list portlet with LifeRay gives an exception. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/portlets/doclist.get.html.ftl | 2 ++ source/web/scripts/ajax/doclist.js | 15 ++++++++++++++- source/web/scripts/ajax/myspaces.js | 16 ++++++++++++++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl index 6f8919d896..431c8d7b72 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl @@ -70,7 +70,9 @@ diff --git a/source/web/scripts/ajax/doclist.js b/source/web/scripts/ajax/doclist.js index 169d1c2df1..2cb2450f27 100644 --- a/source/web/scripts/ajax/doclist.js +++ b/source/web/scripts/ajax/doclist.js @@ -5,6 +5,7 @@ var MyDocs = { DETAIL_MARGIN: 56, TITLE_FONT_SIZE: 18, RESOURCE_PANEL_HEIGHT: 150, + OVERLAY_OPACITY: 0.8, ServiceContext: null, Filter: null, Home: null, @@ -477,6 +478,8 @@ var MyDocs = { { if (confirm("Are you sure you want to delete: " + name)) { + $("docPanelOverlay").setStyle('opacity', MyDocs.OVERLAY_OPACITY); + // ajax call to delete item YAHOO.util.Connect.asyncRequest( "POST", @@ -491,11 +494,13 @@ var MyDocs = { else { alert("Error during delete of item: " + response.responseText); + $("docPanelOverlay").setStyle('opacity', 0); } }, failure: function(response) { alert("Error during delete of item: " + response.responseText); + $("docPanelOverlay").setStyle('opacity', 0); } }, "noderef=" + noderef @@ -508,6 +513,8 @@ var MyDocs = { */ checkoutItem: function(name, noderef) { + $("docPanelOverlay").setStyle('opacity', MyDocs.OVERLAY_OPACITY); + // ajax call to delete item YAHOO.util.Connect.asyncRequest( "POST", @@ -522,11 +529,13 @@ var MyDocs = { else { alert("Error during check out of item: " + response.responseText); + $("docPanelOverlay").setStyle('opacity', 0); } }, failure: function(response) { alert("Error during check out of item: " + response.responseText); + $("docPanelOverlay").setStyle('opacity', 0); } }, "noderef=" + noderef @@ -538,6 +547,8 @@ var MyDocs = { */ checkinItem: function(name, noderef) { + $("docPanelOverlay").setStyle('opacity', MyDocs.OVERLAY_OPACITY); + // ajax call to delete item YAHOO.util.Connect.asyncRequest( "POST", @@ -552,11 +563,13 @@ var MyDocs = { else { alert("Error during check in of item: " + response.responseText); + $("docPanelOverlay").setStyle('opacity', 0); } }, failure: function(response) { alert("Error during check in of item: " + response.responseText); + $("docPanelOverlay").setStyle('opacity', 0); } }, "noderef=" + noderef @@ -598,7 +611,7 @@ var MyDocs = { var anim = new Fx.Styles(panel, {duration: MyDocs.ANIM_LENGTH, transition: Fx.Transitions.linear}); anim.start({'opacity': 1}); - this.fxOverlay.start(0.5); + this.fxOverlay.start(OVERLAY_OPACITY); this.popupPanel = panel; this.popupPanel.nodeRef = nodeRef; diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js index 5e4c82452b..897c858086 100644 --- a/source/web/scripts/ajax/myspaces.js +++ b/source/web/scripts/ajax/myspaces.js @@ -631,6 +631,8 @@ var MySpaces = { { if (confirm("Are you sure you want to delete: " + name)) { + $("spacePanelOverlay").setStyle('opacity', MySpaces.OVERLAY_OPACITY); + // ajax call to delete item YAHOO.util.Connect.asyncRequest( "POST", @@ -645,11 +647,13 @@ var MySpaces = { else { alert("Error during delete of item: " + response.responseText); + $("spacePanelOverlay").setStyle('opacity', 0); } }, failure: function(response) { alert("Error during delete of item: " + response.responseText); + $("spacePanelOverlay").setStyle('opacity', 0); } }, "noderef=" + noderef @@ -662,7 +666,9 @@ var MySpaces = { */ checkoutItem: function(name, noderef) { - // ajax call to delete item + $("spacePanelOverlay").setStyle('opacity', MySpaces.OVERLAY_OPACITY); + + // ajax call to check out item YAHOO.util.Connect.asyncRequest( "POST", getContextPath() + '/ajax/invoke/PortletActionsBean.checkoutItem', @@ -676,11 +682,13 @@ var MySpaces = { else { alert("Error during check out of item: " + response.responseText); + $("spacePanelOverlay").setStyle('opacity', 0); } }, failure: function(response) { alert("Error during check out of item: " + response.responseText); + $("spacePanelOverlay").setStyle('opacity', 0); } }, "noderef=" + noderef @@ -692,7 +700,9 @@ var MySpaces = { */ checkinItem: function(name, noderef) { - // ajax call to delete item + $("spacePanelOverlay").setStyle('opacity', MySpaces.OVERLAY_OPACITY); + + // ajax call to check in item YAHOO.util.Connect.asyncRequest( "POST", getContextPath() + '/ajax/invoke/PortletActionsBean.checkinItem', @@ -706,11 +716,13 @@ var MySpaces = { else { alert("Error during check in of item: " + response.responseText); + $("spacePanelOverlay").setStyle('opacity', 0); } }, failure: function(response) { alert("Error during check in of item: " + response.responseText); + $("spacePanelOverlay").setStyle('opacity', 0); } }, "noderef=" + noderef