You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sm...@apache.org on 2006/12/11 00:45:40 UTC
svn commit: r485315 - in
/portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed: desktop/core.js
widget/PageEditor.js
Author: smilek
Date: Sun Dec 10 15:45:38 2006
New Revision: 485315
URL: http://svn.apache.org/viewvc?view=rev&rev=485315
Log:
corrected previous check-in (which added current page path as 'path' query parameter) to instead append current page path after /ajaxapi for all appropriate ajax api requests
Modified:
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditor.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=485315&r1=485314&r2=485315
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js (original)
+++ portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js Sun Dec 10 15:45:38 2006
@@ -628,14 +628,13 @@
if ( contentListener == null )
contentListener = new jetspeed.om.PortletActionsContentListener();
var queryString = "?action=getactions";
- queryString += "&path=" + escape( jetspeed.page.getPath() );
if ( portletEntityIds == null )
portletEntityIds = jetspeed.page.getPortletIds();
for ( var i = 0 ; i < portletEntityIds.length ; i++ )
{
queryString += "&id=" + portletEntityIds[i];
}
- var getActionsUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + queryString ;
+ var getActionsUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + jetspeed.page.getPath() + queryString;
var mimetype = "text/xml";
var ajaxApiContext = new jetspeed.om.Id( "getactions", { } );
jetspeed.url.retrieveContent( { url: getActionsUrl, mimetype: mimetype }, contentListener, ajaxApiContext, jetspeed.debugContentDumpIds );
@@ -650,8 +649,7 @@
queryString += "&state=" + changeActionState;
if ( changeActionMode != null )
queryString += "&mode=" + changeActionMode;
- queryString += "&path=" + escape( jetspeed.page.getPath() );
- var changeActionUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + queryString ;
+ var changeActionUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + jetspeed.page.getPath() + queryString ;
var mimetype = "text/xml";
var ajaxApiContext = new jetspeed.om.Id( "changeaction", { } );
jetspeed.url.retrieveContent( { url: changeActionUrl, mimetype: mimetype }, contentListener, ajaxApiContext, jetspeed.debugContentDumpIds );
@@ -2766,7 +2764,7 @@
{
var queryString = "?action=" + action + "&id=" + this.entityId + queryStringFragment;
- var psmlMoveActionUrl = jetspeed.page.getPsmlUrl() + queryString;
+ var psmlMoveActionUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + jetspeed.page.getPath() + queryString;
var mimetype = "text/xml";
var ajaxApiContext = new jetspeed.om.Id( action, this.entityId );
Modified: portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditor.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditor.js?view=diff&rev=485315&r1=485314&r2=485315
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditor.js (original)
+++ portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditor.js Sun Dec 10 15:45:38 2006
@@ -329,8 +329,7 @@
getContent: function()
{
var queryString = "?action=updatepage&method=remove";
- queryString += "&path=" + escape( jetspeed.page.getPath() );
- var removePageUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + queryString ;
+ var removePageUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + jetspeed.page.getPath() + queryString ;
var ajaxApiContext = new jetspeed.om.Id( "updatepage-remove-page", { } );
var bindArgs = {};
bindArgs.url = removePageUrl;
@@ -424,8 +423,7 @@
queryString += "&layout=" + escape( this.layoutName );
if ( this.layoutSizes != null )
queryString += "&sizes=" + escape( this.layoutSizes );
- queryString += "&path=" + escape( jetspeed.page.getPath() );
- var updatePageUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + queryString ;
+ var updatePageUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + jetspeed.page.getPath() + queryString ;
var ajaxApiContext = new jetspeed.om.Id( "updatepage-update-fragment", { } );
var bindArgs = {};
bindArgs.url = updatePageUrl;
@@ -469,8 +467,7 @@
queryString += "&theme=" + escape( this.desktopTheme );
this.refreshPage = true;
}
- queryString += "&path=" + escape( jetspeed.page.getPath() );
- var updatePageUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + queryString ;
+ var updatePageUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + jetspeed.page.getPath() + queryString ;
var ajaxApiContext = new jetspeed.om.Id( "updatepage-info", { } );
var bindArgs = {};
bindArgs.url = updatePageUrl;
@@ -504,8 +501,7 @@
if ( this.portletEntityId != null )
{
var queryString = "?action=remove&id=" + this.portletEntityId;
- queryString += "&path=" + escape( jetspeed.page.getPath() );
- var removePortletUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + queryString ;
+ var removePortletUrl = jetspeed.url.basePortalUrl() + jetspeed.url.path.AJAX_API + jetspeed.page.getPath() + queryString ;
var ajaxApiContext = new jetspeed.om.Id( "removeportlet", { } );
var bindArgs = {};
bindArgs.url = removePortletUrl;
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org