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 2007/08/18 06:43:23 UTC
svn commit: r567230 [3/3] - in
/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed:
desktop/ widget/
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/desktop/core.src.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/desktop/core.src.js?view=diff&rev=567230&r1=567229&r2=567230
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/desktop/core.src.js (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/desktop/core.src.js Fri Aug 17 21:43:22 2007
@@ -113,8 +113,8 @@
MENU_WIDGET_ID_PREFIX: "jetspeed-menu-",
- PAGE_EDITOR_WIDGET_ID: "jetspeed-page-editor",
- PAGE_EDITOR_INITIATE_PARAMETER: "editPage",
+ PG_ED_WID: "jetspeed-page-editor",
+ PG_ED_PARAM: "editPage",
PORTAL_ORIGINATE_PARAMETER: "portal",
DEBUG_WINDOW_TAG: "js-dojo-debug"
@@ -841,7 +841,7 @@
if ( fromPortal != null && fromPortal == "true" )
fromDesktop = false;
jetspeed.page.editMode = true;
- var pageEditorWidget = dojo.widget.byId( jetspeed.id.PAGE_EDITOR_WIDGET_ID );
+ var pageEditorWidget = dojo.widget.byId( jetspeed.id.PG_ED_WID );
if ( dojo.render.html.ie60 )
jetspeed.page.displayAllPortlets( true );
if ( pageEditorWidget == null )
@@ -849,7 +849,7 @@
try
{
jetspeed.url.loadingIndicatorShow( "loadpageeditor" );
- pageEditorWidget = dojo.widget.createWidget( "jetspeed:PageEditor", { widgetId: jetspeed.id.PAGE_EDITOR_WIDGET_ID, editorInitiatedFromDesktop: fromDesktop } );
+ pageEditorWidget = dojo.widget.createWidget( "jetspeed:PageEditor", { widgetId: jetspeed.id.PG_ED_WID, editorInitiatedFromDesktop: fromDesktop } );
var allColumnsContainer = document.getElementById( jetspeed.id.COLUMNS );
allColumnsContainer.insertBefore( pageEditorWidget.domNode, allColumnsContainer.firstChild );
}
@@ -871,23 +871,33 @@
{
if ( jetspeed.page.editMode )
{
- var pageEditorWidget = dojo.widget.byId( jetspeed.id.PAGE_EDITOR_WIDGET_ID );
+ var pageEditorWidget = dojo.widget.byId( jetspeed.id.PG_ED_WID );
pageEditorWidget.editModeNormal(); // in case we're in move-mode
jetspeed.page.editMode = false;
if ( ! pageEditorWidget.editorInitiatedFromDesktop )
{
var portalPageUrl = jetspeed.page.getPageUrl( true );
- portalPageUrl = jetspeed.url.removeQueryParameter( portalPageUrl, jetspeed.id.PAGE_EDITOR_INITIATE_PARAMETER );
+ portalPageUrl = jetspeed.url.removeQueryParameter( portalPageUrl, jetspeed.id.PG_ED_PARAM );
portalPageUrl = jetspeed.url.removeQueryParameter( portalPageUrl, jetspeed.id.PORTAL_ORIGINATE_PARAMETER );
window.location.href = portalPageUrl;
}
else
{
- if ( pageEditorWidget != null )
+ var pageEditorInititate = jetspeed.url.getQueryParameter( window.location.href, jetspeed.id.PG_ED_PARAM );
+ if ( pageEditorInititate != null && pageEditorInititate == "true" )
+ { // because of parameter, we must navigate
+ var dtPageUrl = window.location.href; // jetspeed.page.getPageUrl( false );
+ dtPageUrl = jetspeed.url.removeQueryParameter( dtPageUrl, jetspeed.id.PG_ED_PARAM );
+ window.location.href = dtPageUrl;
+ }
+ else
{
- pageEditorWidget.editPageHide();
+ if ( pageEditorWidget != null )
+ {
+ pageEditorWidget.editPageHide();
+ }
+ jetspeed.page.syncPageControls();
}
- jetspeed.page.syncPageControls();
}
}
};
@@ -1208,7 +1218,7 @@
this._portletsInitializeWindowState( portletsByPageColumn[ "z" ] );
// detect edit mode force - likely to be temporary
- var pageEditorInititate = jetspeed.url.getQueryParameter( window.location.href, jetspeed.id.PAGE_EDITOR_INITIATE_PARAMETER );
+ var pageEditorInititate = jetspeed.url.getQueryParameter( window.location.href, jetspeed.id.PG_ED_PARAM );
if ( initiateEditMode || ( pageEditorInititate != null && pageEditorInititate == "true" ) || this.actions[ jetspeed.id.ACTION_NAME_VIEW ] != null )
{
initiateEditMode = false;
@@ -2462,7 +2472,7 @@
},
_destroyEditPage: function()
{
- var pageEditorWidget = dojo.widget.byId( jetspeed.id.PAGE_EDITOR_WIDGET_ID );
+ var pageEditorWidget = dojo.widget.byId( jetspeed.id.PG_ED_WID );
if ( pageEditorWidget != null )
{
pageEditorWidget.editPageDestroy();
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/LayoutEditPane.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/LayoutEditPane.js?view=diff&rev=567230&r1=567229&r2=567230
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/LayoutEditPane.js (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/LayoutEditPane.js Fri Aug 17 21:43:22 2007
@@ -66,7 +66,7 @@
this.pageEditorWidget.openColumnSizesEditor(this.layoutId);
},addPortlet:function(){
var _10=jetspeed.page.getPagePathAndQuery();
-_10=jetspeed.url.addQueryParameter(_10,"editPage","true",true);
+_10=jetspeed.url.addQueryParameter(_10,jetspeed.id.PG_ED_PARAM,"true",true);
jetspeed.page.addPortletInitiate(this.layoutId,_10.toString());
},addLayout:function(){
var _11=this.getCurrentLayout();
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/LayoutEditPane.src.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/LayoutEditPane.src.js?view=diff&rev=567230&r1=567229&r2=567230
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/LayoutEditPane.src.js (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/LayoutEditPane.src.js Fri Aug 17 21:43:22 2007
@@ -152,7 +152,7 @@
addPortlet: function()
{
var jspage = jetspeed.page.getPagePathAndQuery();
- jspage = jetspeed.url.addQueryParameter( jspage, "editPage", "true", true );
+ jspage = jetspeed.url.addQueryParameter( jspage, jetspeed.id.PG_ED_PARAM, "true", true );
jetspeed.page.addPortletInitiate( this.layoutId, jspage.toString() );
},
addLayout: function()
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditor.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditor.js?view=diff&rev=567230&r1=567229&r2=567230
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditor.js (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditor.js Fri Aug 17 21:43:22 2007
@@ -205,7 +205,7 @@
dojo.lang.setTimeout(this,this._doRefreshPage,10);
},_doRefreshPage:function(){
var _32=jetspeed.page.getPageUrl();
-_32=jetspeed.url.addQueryParameter(_32,"editPage","true",true);
+_32=jetspeed.url.addQueryParameter(_32,jetspeed.id.PG_ED_PARAM,"true",true);
window.location.href=_32.toString();
},editModeNormal:function(){
var _33=dojo.render.html.ie60;
@@ -329,7 +329,7 @@
},notifySuccess:function(_59,_5a,_5b){
if(jetspeed.url.checkAjaxApiResponse(_5a,_59,true,"updatepage-remove-page")){
var _5c=jetspeed.page.makePageUrl("/");
-_5c+="?"+jetspeed.id.PAGE_EDITOR_INITIATE_PARAMETER+"=true";
+_5c+="?"+jetspeed.id.PG_ED_PARAM+"=true";
window.location.href=_5c;
}
},notifyFailure:function(_5d,_5e,_5f,_60){
@@ -390,7 +390,7 @@
if(!dojo.string.endsWith(_70,".psml",true)){
_70+=".psml";
}
-_70+="?"+jetspeed.id.PAGE_EDITOR_INITIATE_PARAMETER+"=true";
+_70+="?"+jetspeed.id.PG_ED_PARAM+"=true";
window.location.href=_70;
}
},notifyFailure:function(_71,_72,_73,_74){
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditor.src.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditor.src.js?view=diff&rev=567230&r1=567229&r2=567230
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditor.src.js (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditor.src.js Fri Aug 17 21:43:22 2007
@@ -323,7 +323,7 @@
_doRefreshPage: function()
{
var pageUrl = jetspeed.page.getPageUrl();
- pageUrl = jetspeed.url.addQueryParameter( pageUrl, "editPage", "true", true );
+ pageUrl = jetspeed.url.addQueryParameter( pageUrl, jetspeed.id.PG_ED_PARAM, "true", true );
window.location.href = pageUrl.toString();
},
@@ -482,7 +482,7 @@
if ( jetspeed.url.checkAjaxApiResponse( requestUrl, data, true, "updatepage-remove-page" ) )
{
var pageUrl = jetspeed.page.makePageUrl( "/" );
- pageUrl += "?" + jetspeed.id.PAGE_EDITOR_INITIATE_PARAMETER + "=true";
+ pageUrl += "?" + jetspeed.id.PG_ED_PARAM + "=true";
window.location.href = pageUrl;
}
},
@@ -560,7 +560,7 @@
var pageUrl = jetspeed.page.makePageUrl( this.pagePath );
if ( ! dojo.string.endsWith( pageUrl, ".psml", true ) )
pageUrl += ".psml";
- pageUrl += "?" + jetspeed.id.PAGE_EDITOR_INITIATE_PARAMETER + "=true";
+ pageUrl += "?" + jetspeed.id.PG_ED_PARAM + "=true";
window.location.href = pageUrl;
}
},
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PortletWindow.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PortletWindow.js?view=diff&rev=567230&r1=567229&r2=567230
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PortletWindow.js (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PortletWindow.js Fri Aug 17 21:43:22 2007
@@ -520,7 +520,7 @@
}else{
if(_4e==jetspeed.id.ACTION_NAME_REMOVEPORTLET){
if(this.portlet){
-var _51=dojo.widget.byId(jetspeed.id.PAGE_EDITOR_WIDGET_ID);
+var _51=dojo.widget.byId(jetspeed.id.PG_ED_WID);
if(_51!=null){
_51.deletePortlet(this.portlet.entityId,this.title);
}
Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PortletWindow.src.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PortletWindow.src.js?view=diff&rev=567230&r1=567229&r2=567230
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PortletWindow.src.js (original)
+++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PortletWindow.src.js Fri Aug 17 21:43:22 2007
@@ -790,7 +790,7 @@
{
if ( this.portlet )
{
- var pageEditorWidget = dojo.widget.byId( jetspeed.id.PAGE_EDITOR_WIDGET_ID );
+ var pageEditorWidget = dojo.widget.byId( jetspeed.id.PG_ED_WID );
if ( pageEditorWidget != null )
{
pageEditorWidget.deletePortlet( this.portlet.entityId, this.title );
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org