portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smi...@apache.org
Subject svn commit: r547623 - /portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/LayoutEditPane.js
Date Fri, 15 Jun 2007 11:11:13 GMT
Author: smilek
Date: Fri Jun 15 04:11:12 2007
New Revision: 547623

URL: http://svn.apache.org/viewvc?view=rev&rev=547623
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/widget/LayoutEditPane.js

Modified: portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/LayoutEditPane.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/LayoutEditPane.js?view=diff&rev=547623&r1=547622&r2=547623
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/LayoutEditPane.js (original)
+++ portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/LayoutEditPane.js Fri Jun
15 04:11:12 2007
@@ -121,22 +121,7 @@
                 }
                 this.layoutNameSelect.dataProvider.setData( layoutNameData );
             }
-            if ( this.isRootLayout )
-            {
-                if ( this.deleteLayoutButton != null )
-                    this.deleteLayoutButton.domNode.style.display = "none";
-                if ( this.editModeLayoutMoveButton != null )
-                    this.editModeLayoutMoveButton.domNode.style.display = "block";
-                if ( this.editModeNormalButton != null )
-                    this.editModeNormalButton.domNode.style.display = "none";
-            }
-            else
-            {
-                if ( this.editModeLayoutMoveButton != null )
-                    this.editModeLayoutMoveButton.domNode.style.display = "none";
-                if ( this.editModeNormalButton != null )
-                    this.editModeNormalButton.domNode.style.display = "none";
-            }
+            this.syncButtons();
             
             this.layoutMoveContainer = dojo.widget.createWidget( "jetspeed:LayoutEditPaneMoveHandle",
 				{
@@ -229,6 +214,31 @@
         getPageColumnIndex: function()
         {
             return jetspeed.page.getColumnIndexContainingNode( this.domNode );
+        },
+        
+        editModeRedisplay: function()
+        {
+            this.show();
+            this.syncButtons();
+        },
+        syncButtons: function()
+        {
+            if ( this.isRootLayout )
+            {
+                if ( this.deleteLayoutButton != null )
+                    this.deleteLayoutButton.domNode.style.display = "none";
+                if ( this.editModeLayoutMoveButton != null )
+                    this.editModeLayoutMoveButton.domNode.style.display = "block";
+                if ( this.editModeNormalButton != null )
+                    this.editModeNormalButton.domNode.style.display = "none";
+            }
+            else
+            {
+                if ( this.editModeLayoutMoveButton != null )
+                    this.editModeLayoutMoveButton.domNode.style.display = "none";
+                if ( this.editModeNormalButton != null )
+                    this.editModeNormalButton.domNode.style.display = "none";
+            }
         }
 	}
 );



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message