Author: smilek
Date: Wed Jan 24 20:57:26 2007
New Revision: 499662
URL: http://svn.apache.org/viewvc?view=rev&rev=499662
Log:
added optional layoutId argument to jetspeed.addNewPortletDefinition() and
jetspeed.om.Page.addPortletInitiate()
Modified:
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js
Modified:
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js?view=diff&rev=499662&r1=499661&r2=499662
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js
(original)
+++ portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js Wed
Jan 24 20:57:26 2007
@@ -655,18 +655,28 @@
jetspeed.url.retrieveContent( { url: changeActionUrl, mimetype: mimetype
}, contentListener, ajaxApiContext, jetspeed.debugContentDumpIds );
};
-jetspeed.addNewPortletDefinition = function( /* jetspeed.om.PortletDef */
portletDef, windowWidgetId, /* String */ psmlUrl )
+jetspeed.addNewPortletDefinition = function( /* jetspeed.om.PortletDef */
portletDef, windowWidgetId, /* String */ psmlUrl, /* String */ layoutId )
{
var addToCurrentPage = true;
if ( psmlUrl != null )
+ {
addToCurrentPage = false;
+ }
var contentListener = new
jetspeed.om.PortletAddAjaxApiCallbackContentListener( portletDef,
windowWidgetId, addToCurrentPage );
var queryString = "?action=add&id=" + escape( portletDef.getPortletName()
);
+ if ( layoutId != null && layoutId.length > 0 )
+ {
+ queryString += "&layoutid=" + escape( layoutId );
+ }
var addPortletUrl = null;
if ( psmlUrl != null )
+ {
addPortletUrl = psmlUrl + queryString; // psmlUrl example:
http://localhost:8080/jetspeed/ajaxapi/google-maps.psml
+ }
else
+ {
addPortletUrl = jetspeed.page.getPsmlUrl() + queryString;
+ }
var mimetype = "text/xml";
var ajaxApiContext = new jetspeed.om.Id( "addportlet", { } );
jetspeed.url.retrieveContent( { url: addPortletUrl, mimetype: mimetype },
contentListener, ajaxApiContext, jetspeed.debugContentDumpIds );
@@ -2142,9 +2152,11 @@
},
// ... add portlet
- addPortletInitiate: function()
+ addPortletInitiate: function( /* String */ layoutId )
{
- var addportletPageUrl = jetspeed.url.basePortalUrl() +
jetspeed.url.path.DESKTOP + "/system/customizer/selector.psml?jspage=" +
this.getPath();
+ var addportletPageUrl = jetspeed.url.basePortalUrl() +
jetspeed.url.path.DESKTOP + "/system/customizer/selector.psml?jspage=" +
escape( this.getPath() );
+ if ( layoutId != null )
+ addportletPageUrl += "&jslayoutid=" + escape( layoutId );
jetspeed.changeActionForPortlet( this.rootFragmentId, null,
jetspeed.id.ACTION_NAME_EDIT, new jetspeed.om.PageChangeActionContentListener(
addportletPageUrl ) );
},
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
