Author: smilek
Date: Fri Jun 15 04:09:54 2007
New Revision: 547617
URL: http://svn.apache.org/viewvc?view=rev&rev=547617
Log:
Changes to address the following JIRA issues:
JS2-733 - Desktop: non-movable portlets are deletable
JS2-700 - Display loading in progress message from desktop
JS2-699 - When going back from view mode to edit mode, icon is not always
updated on desktop
JS2-695 - The Desktop does NOT support the no-action layouts
JS2-694 - actionResponse.sendRedirect("some psml page.psml") fails on the
desktop
Modified:
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/common.js
Modified: portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/common.js
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/common.js?view=diff&rev=547617&r1=547616&r2=547617
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/common.js (original)
+++ portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/common.js Fri Jun
15 04:09:54 2007
@@ -796,15 +796,16 @@
var loading = document.getElementById(
jetspeed.url.LOADING_INDICATOR_ID );
if ( loading != null && loading.style )
{
- if ( loading.style[ "display" ] == "none" )
+ var actionlabel = null;
+ if ( jetspeed.prefs != null && jetspeed.prefs.desktopActionLabels
!= null )
+ actionlabel = jetspeed.prefs.desktopActionLabels[ actionName ];
+
+ if ( actionlabel != null && actionlabel.length > 0 &&
loading.style[ "display" ] == "none" )
{
loading.style[ "display" ] = "";
if ( actionName != null )
{
- var actionlabel = null;
- if ( jetspeed.prefs != null &&
jetspeed.prefs.desktopActionLabels != null )
- actionlabel = jetspeed.prefs.desktopActionLabels[
actionName ];
if ( actionlabel != null && actionlabel.length > 0 )
{
var loadingContent = document.getElementById(
jetspeed.url.LOADING_INDICATOR_ID + "-content" );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
