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 wo...@apache.org on 2009/04/03 13:13:26 UTC
svn commit: r761615 [1/3] - in
/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed:
common.js common.src.js desktop/core.js desktop/core.src.js
Author: woonsan
Date: Fri Apr 3 11:13:26 2009
New Revision: 761615
URL: http://svn.apache.org/viewvc?rev=761615&view=rev
Log:
JS2-949: Adds javascript codes to add contributed head elements.
Note that if a contributed head element has ID attribute, then the desktop javascript would add the element only once.
Otherwise, the desktop script will add the contributed head element every time when a portlet is rendered.
Now, I'd like to move to portlet migrations.
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/common.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/common.src.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/desktop/core.js
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/desktop/core.src.js
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/common.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/common.js?rev=761615&r1=761614&r2=761615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/common.js (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/common.js Fri Apr 3 11:13:26 2009
@@ -114,98 +114,105 @@
jetspeed.pageLoaded();
}
};
-jetspeed.getBody=function(){
+jetspeed.getHead=function(){
var _d=jetspeed;
-if(_d.docBody==null){
-_d.docBody=document.body||document.getElementsByTagName("body")[0];
+if(_d.docHead==null){
+_d.docHead=document.head||document.getElementsByTagName("head")[0];
+}
+return _d.docHead;
+};
+jetspeed.getBody=function(){
+var _e=jetspeed;
+if(_e.docBody==null){
+_e.docBody=document.body||document.getElementsByTagName("body")[0];
}
-return _d.docBody;
+return _e.docBody;
};
jetspeed.formatError=function(ex){
if(ex==null){
return "";
}
-var _f=" error:";
+var msg=" error:";
if(ex.message!=null){
-_f+=" "+ex.message;
-}
-var _10=ex.number||ex.lineNumber||ex.lineNo;
-if(_10==null||_10=="0"||_10.length==0){
-_10=null;
-}
-var _11=ex.fileName;
-if(_11!=null){
-var _12=_11.lastIndexOf("/");
-if(_12!=-1&&_12<(_11.length-1)){
-_11=_11.substring(_12+1);
+msg+=" "+ex.message;
}
-}
-if(_11==null||_11.length==0){
+var _11=ex.number||ex.lineNumber||ex.lineNo;
+if(_11==null||_11=="0"||_11.length==0){
_11=null;
}
-var _13=ex.type;
-if(_13==null||_13.length==0||_13=="unknown"){
-_13=null;
-}
-if(_10!=null||_11!=null||_13!=null){
-_f+=" ("+(_11!=null?(" "+_11):"");
-_f+=(_10!=null?(" line "+_10):"");
-_f+=(_13!=null?(" type "+_13):"");
-_f+=" )";
+var _12=ex.fileName;
+if(_12!=null){
+var _13=_12.lastIndexOf("/");
+if(_13!=-1&&_13<(_12.length-1)){
+_12=_12.substring(_13+1);
+}
+}
+if(_12==null||_12.length==0){
+_12=null;
+}
+var _14=ex.type;
+if(_14==null||_14.length==0||_14=="unknown"){
+_14=null;
+}
+if(_11!=null||_12!=null||_14!=null){
+msg+=" ("+(_12!=null?(" "+_12):"");
+msg+=(_11!=null?(" line "+_11):"");
+msg+=(_14!=null?(" type "+_14):"");
+msg+=" )";
}
-return _f;
+return msg;
};
jetspeed.url.LOADING_INDICATOR_ID="js-showloading";
jetspeed.url.LOADING_INDICATOR_IMG_ID="js-showloading-img";
jetspeed.url.path={SERVER:null,JETSPEED:null,AJAX_API:null,DESKTOP:null,PORTAL:null,PORTLET:null,ACTION:null,RENDER:null,initialized:false};
-jetspeed.url.pathInitialize=function(_14){
+jetspeed.url.pathInitialize=function(_15){
var jsU=jetspeed.url;
-var _16=jsU.path;
-if(!_14&&_16.initialized){
+var _17=jsU.path;
+if(!_15&&_17.initialized){
return;
}
-var _17=document.getElementsByTagName("base");
-var _18=null;
-if(_17&&_17.length==1){
-_18=_17[0].href;
-}else{
-_18=window.location.href;
-}
-var _19=jsU.parse(_18);
-var _1a=_19.path;
-var _1b="";
-if(_19.scheme!=null){
-_1b+=_19.scheme+":";
+var _18=document.getElementsByTagName("base");
+var _19=null;
+if(_18&&_18.length==1){
+_19=_18[0].href;
+}else{
+_19=window.location.href;
+}
+var _1a=jsU.parse(_19);
+var _1b=_1a.path;
+var _1c="";
+if(_1a.scheme!=null){
+_1c+=_1a.scheme+":";
}
-if(_19.authority!=null){
-_1b+="//"+_19.authority;
+if(_1a.authority!=null){
+_1c+="//"+_1a.authority;
}
-var _1c=null;
+var _1d=null;
if(djConfig.jetspeed.rootContext){
-_1c="";
+_1d="";
}else{
-var _1d=-1;
-for(var _1e=1;_1d<=_1e;_1e++){
-_1d=_1a.indexOf("/",_1e);
-if(_1d==-1){
+var _1e=-1;
+for(var _1f=1;_1e<=_1f;_1f++){
+_1e=_1b.indexOf("/",_1f);
+if(_1e==-1){
break;
}
}
-if(_1d==-1){
-_1c=_1a;
+if(_1e==-1){
+_1d=_1b;
}else{
-_1c=_1a.substring(0,_1d);
+_1d=_1b.substring(0,_1e);
}
}
-_16.JETSPEED=_1c;
-_16.SERVER=_1b;
-_16.AJAX_API=_16.JETSPEED+"/ajaxapi";
-_16.DESKTOP=_16.JETSPEED+"/desktop";
-_16.PORTAL=_16.JETSPEED+"/portal";
-_16.PORTLET=_16.JETSPEED+"/portlet";
-_16.ACTION=_16.JETSPEED+"/action";
-_16.RENDER=_16.JETSPEED+"/render";
-_16.initialized=true;
+_17.JETSPEED=_1d;
+_17.SERVER=_1c;
+_17.AJAX_API=_17.JETSPEED+"/ajaxapi";
+_17.DESKTOP=_17.JETSPEED+"/desktop";
+_17.PORTAL=_17.JETSPEED+"/portal";
+_17.PORTLET=_17.JETSPEED+"/portlet";
+_17.ACTION=_17.JETSPEED+"/action";
+_17.RENDER=_17.JETSPEED+"/render";
+_17.initialized=true;
};
jetspeed.url.parse=function(url){
if(url==null){
@@ -219,9 +226,9 @@
jetspeed.url.JSUri=function(url){
if(url!=null){
if(!url.path){
-var _21="^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$";
-var r=url.toString().match(new RegExp(_21));
-var _23={};
+var _22="^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$";
+var r=url.toString().match(new RegExp(_22));
+var _24={};
this.scheme=r[2]||(r[1]?"":null);
this.authority=r[4]||(r[3]?"":null);
this.path=r[5];
@@ -248,8 +255,8 @@
jetspeed.url.scheme={HTTP_PREFIX:"http://",HTTP_PREFIX_LEN:"http://".length,HTTPS_PREFIX:"https://",HTTPS_PREFIX_LEN:"https://".length};
jetspeed.url.isPortal=function(){
if(window.djConfig&&window.djConfig.jetspeed){
-var _25=window.djConfig.jetspeed.servletPath;
-if(_25!=null&&_25.toLowerCase().indexOf("/desktop")==0){
+var _26=window.djConfig.jetspeed.servletPath;
+if(_26!=null&&_26.toLowerCase().indexOf("/desktop")==0){
return false;
}
}
@@ -277,236 +284,236 @@
}
return jetspeed.url.basePortalUrl()+jetspeed.url.path.JETSPEED;
};
-jetspeed.url.addPath=function(url,_27){
-if(_27==null||_27.length==0){
+jetspeed.url.addPath=function(url,_28){
+if(_28==null||_28.length==0){
return url;
}
-var _28=new jetspeed.url.JSUri(url);
-var _29=_28.path;
-if(_29!=null&&_29.length>0){
-if(_28.path.charCodeAt(_29.length-1)==47){
-if(_27.charCodeAt(0)==47){
-if(_27.length>1){
-_28.path+=_27.substring(1);
+var _29=new jetspeed.url.JSUri(url);
+var _2a=_29.path;
+if(_2a!=null&&_2a.length>0){
+if(_29.path.charCodeAt(_2a.length-1)==47){
+if(_28.charCodeAt(0)==47){
+if(_28.length>1){
+_29.path+=_28.substring(1);
}
}else{
-_28.path+=_27;
+_29.path+=_28;
}
}else{
-if(_27.charCodeAt(0)==47){
-_28.path+=_27;
+if(_28.charCodeAt(0)==47){
+_29.path+=_28;
}else{
-if(_27.length>1){
-_28.path+="/"+_27;
+if(_28.length>1){
+_29.path+="/"+_28;
}
}
}
}
-var _2a=jetspeed.url.parse(_28);
-return _2a.toString();
+var _2b=jetspeed.url.parse(_29);
+return _2b.toString();
};
jetspeed.url.urlStartsWithHttp=function(url){
if(url){
var len=url.length;
-var _2d=jetspeed.url.scheme.HTTPS_PREFIX_LEN;
-if(len>_2d){
-var _2e=jetspeed.url.scheme.HTTP_PREFIX_LEN;
-if(url.substring(0,_2e)==jetspeed.url.scheme.HTTP_PREFIX){
+var _2e=jetspeed.url.scheme.HTTPS_PREFIX_LEN;
+if(len>_2e){
+var _2f=jetspeed.url.scheme.HTTP_PREFIX_LEN;
+if(url.substring(0,_2f)==jetspeed.url.scheme.HTTP_PREFIX){
return true;
}
-if(url.substring(0,_2d)==jetspeed.url.scheme.HTTPS_PREFIX){
+if(url.substring(0,_2e)==jetspeed.url.scheme.HTTPS_PREFIX){
return true;
}
}
}
return false;
};
-jetspeed.url.addQueryParameter=function(_2f,_30,_31,_32){
-if(_2f==null){
-return _2f;
-}
-if(!_2f.path){
-_2f=jetspeed.url.parse(_2f);
-}
-if(_2f==null){
-return null;
-}
+jetspeed.url.addQueryParameter=function(_30,_31,_32,_33){
if(_30==null){
-return _2f;
+return _30;
}
-_2f.jsQParamN=null;
-if(_32){
-_2f=jetspeed.url.removeQueryParameter(_2f,_30,false);
+if(!_30.path){
+_30=jetspeed.url.parse(_30);
}
-var _33=_2f.query;
-if(_33==null){
-_33="";
+if(_30==null){
+return null;
}
-var _34=_33.length;
-if(_34>0){
-_33+="&";
+if(_31==null){
+return _30;
}
-_33+=_30+"="+(_31!=null?_31:"");
-_2f.query=_33;
-var _35=new jetspeed.url.JSUri(_2f);
-_2f=jetspeed.url.parse(_35);
-return _2f;
+_30.jsQParamN=null;
+if(_33){
+_30=jetspeed.url.removeQueryParameter(_30,_31,false);
+}
+var _34=_30.query;
+if(_34==null){
+_34="";
+}
+var _35=_34.length;
+if(_35>0){
+_34+="&";
+}
+_34+=_31+"="+(_32!=null?_32:"");
+_30.query=_34;
+var _36=new jetspeed.url.JSUri(_30);
+_30=jetspeed.url.parse(_36);
+return _30;
};
-jetspeed.url.removeAllQueryParameters=function(_36){
-return jetspeed.url.removeQueryParameter(_36,null,true);
+jetspeed.url.removeAllQueryParameters=function(_37){
+return jetspeed.url.removeQueryParameter(_37,null,true);
};
-jetspeed.url.removeQueryParameter=function(_37,_38,_39){
-if(_37==null){
-return _37;
+jetspeed.url.removeQueryParameter=function(_38,_39,_3a){
+if(_38==null){
+return _38;
}
-if(!_37.path){
-_37=jetspeed.url.parse(_37);
+if(!_38.path){
+_38=jetspeed.url.parse(_38);
}
-if(_37==null){
+if(_38==null){
return null;
}
-_37.jsQParamN=null;
-var _3a=_37.query;
-var _3b=((_3a!=null)?_3a.length:0);
-if(_3b>0){
-if(_39){
-_3a=null;
-}else{
-if(_38==null){
-return _37;
-}else{
-var _3c=_38;
-var _3d=_3a.indexOf(_3c);
-if(_3d==0){
-_3a=jetspeed.url._removeQP(_3a,_3b,_3c,_3d);
+_38.jsQParamN=null;
+var _3b=_38.query;
+var _3c=((_3b!=null)?_3b.length:0);
+if(_3c>0){
+if(_3a){
+_3b=null;
+}else{
+if(_39==null){
+return _38;
+}else{
+var _3d=_39;
+var _3e=_3b.indexOf(_3d);
+if(_3e==0){
+_3b=jetspeed.url._removeQP(_3b,_3c,_3d,_3e);
}
-_3c="&"+_38;
+_3d="&"+_39;
while(true){
-_3b=((_3a!=null)?_3a.length:0);
-_3d=_3a.indexOf(_3c,0);
-if(_3d==-1){
+_3c=((_3b!=null)?_3b.length:0);
+_3e=_3b.indexOf(_3d,0);
+if(_3e==-1){
break;
}
-var _3e=jetspeed.url._removeQP(_3a,_3b,_3c,_3d);
-if(_3e==_3a){
+var _3f=jetspeed.url._removeQP(_3b,_3c,_3d,_3e);
+if(_3f==_3b){
break;
}
-_3a=_3e;
+_3b=_3f;
}
-if(_3a.length>0){
-if(_3a.charCodeAt(0)==38){
-_3a=((_3a.length>1)?_3a.substring(1):"");
+if(_3b.length>0){
+if(_3b.charCodeAt(0)==38){
+_3b=((_3b.length>1)?_3b.substring(1):"");
}
-if(_3a.length>0&&_3a.charCodeAt(0)==63){
-_3a=((_3a.length>1)?_3a.substring(1):"");
+if(_3b.length>0&&_3b.charCodeAt(0)==63){
+_3b=((_3b.length>1)?_3b.substring(1):"");
}
}
}
}
-_37.query=_3a;
-var _3f=new jetspeed.url.JSUri(_37);
-_37=jetspeed.url.parse(_3f);
+_38.query=_3b;
+var _40=new jetspeed.url.JSUri(_38);
+_38=jetspeed.url.parse(_40);
}
-return _37;
+return _38;
};
-jetspeed.url._removeQP=function(_40,_41,_42,_43){
-if(_43==-1){
-return _40;
+jetspeed.url._removeQP=function(_41,_42,_43,_44){
+if(_44==-1){
+return _41;
}
-if(_41>(_43+_42.length)){
-var _44=_40.charCodeAt(_43+_42.length);
-if(_44==61){
-var _45=_40.indexOf("&",_43+_42.length+1);
-if(_45!=-1){
-if(_43>0){
-_40=_40.substring(0,_43)+_40.substring(_45);
+if(_42>(_44+_43.length)){
+var _45=_41.charCodeAt(_44+_43.length);
+if(_45==61){
+var _46=_41.indexOf("&",_44+_43.length+1);
+if(_46!=-1){
+if(_44>0){
+_41=_41.substring(0,_44)+_41.substring(_46);
}else{
-_40=((_45<(_41-1))?_40.substring(_45):"");
+_41=((_46<(_42-1))?_41.substring(_46):"");
}
}else{
-if(_43>0){
-_40=_40.substring(0,_43);
+if(_44>0){
+_41=_41.substring(0,_44);
}else{
-_40="";
+_41="";
}
}
}else{
-if(_44==38){
-if(_43>0){
-_40=_40.substring(0,_43)+_40.substring(_43+_42.length);
+if(_45==38){
+if(_44>0){
+_41=_41.substring(0,_44)+_41.substring(_44+_43.length);
}else{
-_40=_40.substring(_43+_42.length);
+_41=_41.substring(_44+_43.length);
}
}
}
}else{
-if(_41==(_43+_42.length)){
-_40="";
+if(_42==(_44+_43.length)){
+_41="";
}
}
-return _40;
+return _41;
};
-jetspeed.url.getQueryParameter=function(_46,_47){
-if(_46==null){
+jetspeed.url.getQueryParameter=function(_47,_48){
+if(_47==null){
return null;
}
-if(!_46.authority||!_46.scheme){
-_46=jetspeed.url.parse(_46);
+if(!_47.authority||!_47.scheme){
+_47=jetspeed.url.parse(_47);
}
-if(_46==null){
+if(_47==null){
return null;
}
-if(_46.jsQParamN==null&&_46.query){
-var _48=new Array();
-var _49=_46.query.split("&");
-for(var i=0;i<_49.length;i++){
-if(_49[i]==null){
-_49[i]="";
-}
-var _4b=_49[i].indexOf("=");
-if(_4b>0&&_4b<(_49[i].length-1)){
-_48[i]=unescape(_49[i].substring(_4b+1));
-_49[i]=unescape(_49[i].substring(0,_4b));
+if(_47.jsQParamN==null&&_47.query){
+var _49=new Array();
+var _4a=_47.query.split("&");
+for(var i=0;i<_4a.length;i++){
+if(_4a[i]==null){
+_4a[i]="";
+}
+var _4c=_4a[i].indexOf("=");
+if(_4c>0&&_4c<(_4a[i].length-1)){
+_49[i]=unescape(_4a[i].substring(_4c+1));
+_4a[i]=unescape(_4a[i].substring(0,_4c));
}else{
-_48[i]="";
+_49[i]="";
}
}
-_46.jsQParamN=_49;
-_46.jsQParamV=_48;
+_47.jsQParamN=_4a;
+_47.jsQParamV=_49;
}
-if(_46.jsQParamN!=null){
-for(var i=0;i<_46.jsQParamN.length;i++){
-if(_46.jsQParamN[i]==_47){
-return _46.jsQParamV[i];
+if(_47.jsQParamN!=null){
+for(var i=0;i<_47.jsQParamN.length;i++){
+if(_47.jsQParamN[i]==_48){
+return _47.jsQParamV[i];
}
}
}
return null;
};
jetspeed.om.Id=function(){
-var _4c="";
+var _4d="";
for(var i=0;i<arguments.length;i++){
if(dojo.lang.isString(arguments[i])){
-if(_4c.length>0){
-_4c+="-";
+if(_4d.length>0){
+_4d+="-";
}
-_4c+=arguments[i];
+_4d+=arguments[i];
}else{
if(dojo.lang.isObject(arguments[i])){
-for(var _4e in arguments[i]){
-this[_4e]=arguments[i][_4e];
+for(var _4f in arguments[i]){
+this[_4f]=arguments[i][_4f];
}
}
}
}
-this.id=_4c;
+this.id=_4d;
};
jetspeed.om.Id.prototype={getId:function(){
return this.id;
}};
if(window.dojo){
-jetspeed.url.BindArgs=function(_4f){
-dojo.lang.mixin(this,_4f);
+jetspeed.url.BindArgs=function(_50){
+dojo.lang.mixin(this,_50);
if(!this.mimetype){
this.mimetype="text/html";
}
@@ -515,38 +522,38 @@
}
};
dojo.lang.extend(jetspeed.url.BindArgs,{createIORequest:function(){
-var _50=new dojo.io.Request(this.url,this.mimetype);
-_50.fromKwArgs(this);
-return _50;
-},load:function(_51,_52,_53){
+var _51=new dojo.io.Request(this.url,this.mimetype);
+_51.fromKwArgs(this);
+return _51;
+},load:function(_52,_53,_54){
try{
-var _54=null;
+var _55=null;
if(this.debugContentDumpIds){
-_54=((this.domainModelObject&&dojo.lang.isFunction(this.domainModelObject.getId))?this.domainModelObject.getId():((this.domainModelObject&&this.domainModelObject.id)?String(this.domainModelObject.id):""));
-var _55=false;
-for(var _56=0;_56<this.debugContentDumpIds.length;_56++){
-if(_54.match(new RegExp(this.debugContentDumpIds[_56]))){
-_55=true;
+_55=((this.domainModelObject&&dojo.lang.isFunction(this.domainModelObject.getId))?this.domainModelObject.getId():((this.domainModelObject&&this.domainModelObject.id)?String(this.domainModelObject.id):""));
+var _56=false;
+for(var _57=0;_57<this.debugContentDumpIds.length;_57++){
+if(_55.match(new RegExp(this.debugContentDumpIds[_57]))){
+_56=true;
break;
}
}
-if(_55){
-if(dojo.lang.isString(_52)){
-dojo.debug("retrieveContent ["+(_54?_54:this.url)+"] content: "+_52);
-}else{
-var _57=dojo.dom.innerXML(_52);
-if(!_57){
-_57=(_52!=null?"!= null (IE no XMLSerializer)":"null");
+if(_56){
+if(dojo.lang.isString(_53)){
+dojo.debug("retrieveContent ["+(_55?_55:this.url)+"] content: "+_53);
+}else{
+var _58=dojo.dom.innerXML(_53);
+if(!_58){
+_58=(_53!=null?"!= null (IE no XMLSerializer)":"null");
}
-dojo.debug("retrieveContent ["+(_54?_54:this.url)+"] xml-content: "+_57);
+dojo.debug("retrieveContent ["+(_55?_55:this.url)+"] xml-content: "+_58);
}
}
}
if(this.contentListener&&dojo.lang.isFunction(this.contentListener.notifySuccess)){
-this.contentListener.notifySuccess(_52,this.url,this.domainModelObject,_53);
+this.contentListener.notifySuccess(_53,this.url,this.domainModelObject,_54);
}else{
-_54=((this.domainModelObject&&dojo.lang.isFunction(this.domainModelObject.getId))?this.domainModelObject.getId():"");
-dojo.debug("retrieveContent ["+(_54?_54:this.url)+"] no valid contentListener");
+_55=((this.domainModelObject&&dojo.lang.isFunction(this.domainModelObject.getId))?this.domainModelObject.getId():"");
+dojo.debug("retrieveContent ["+(_55?_55:this.url)+"] no valid contentListener");
}
if(this.hideLoadingIndicator){
jetspeed.url.loadingIndicatorHide();
@@ -558,10 +565,10 @@
}
dojo.raise("dojo.io.bind "+jetspeed.formatError(e));
}
-},error:function(_58,_59){
+},error:function(_59,_5a){
try{
if(this.contentListener&&dojo.lang.isFunction(this.contentListener.notifyFailure)){
-this.contentListener.notifyFailure(_58,_59,this.url,this.domainModelObject);
+this.contentListener.notifyFailure(_59,_5a,this.url,this.domainModelObject);
}
if(this.hideLoadingIndicator){
jetspeed.url.loadingIndicatorHide();
@@ -574,140 +581,140 @@
throw e;
}
}});
-jetspeed.url.retrieveContent=function(_5a,_5b,_5c,_5d){
-if(!_5a){
-_5a={};
-}
-_5a.contentListener=_5b;
-_5a.domainModelObject=_5c;
-_5a.debugContentDumpIds=_5d;
-var _5e=new jetspeed.url.BindArgs(_5a);
-if(_5a.showLoadingIndicator||(_5b&&!_5b.suppressLoadingIndicator&&_5a.showLoadingIndicator!=false)){
+jetspeed.url.retrieveContent=function(_5b,_5c,_5d,_5e){
+if(!_5b){
+_5b={};
+}
+_5b.contentListener=_5c;
+_5b.domainModelObject=_5d;
+_5b.debugContentDumpIds=_5e;
+var _5f=new jetspeed.url.BindArgs(_5b);
+if(_5b.showLoadingIndicator||(_5c&&!_5c.suppressLoadingIndicator&&_5b.showLoadingIndicator!=false)){
if(jetspeed.url.loadingIndicatorShow()){
-_5e.hideLoadingIndicator=true;
+_5f.hideLoadingIndicator=true;
}
}
-dojo.io.bind(_5e.createIORequest());
+dojo.io.bind(_5f.createIORequest());
};
-jetspeed.url.checkAjaxApiResponse=function(_5f,_60,_61,_62,_63,_64){
-var _65=false;
-var _66=_60.getElementsByTagName("status");
-if(_66!=null){
-var _67=_66[0].firstChild.nodeValue;
-if(_67=="success"){
-_65=_67;
-}else{
-if(_61&&_61.length>0){
-for(var i=0;i<_61.length;i++){
-if(_67==_61[i]){
-_65=_67;
+jetspeed.url.checkAjaxApiResponse=function(_60,_61,_62,_63,_64,_65){
+var _66=false;
+var _67=_61.getElementsByTagName("status");
+if(_67!=null){
+var _68=_67[0].firstChild.nodeValue;
+if(_68=="success"){
+_66=_68;
+}else{
+if(_62&&_62.length>0){
+for(var i=0;i<_62.length;i++){
+if(_68==_62[i]){
+_66=_68;
break;
}
}
}
}
}
-if((!_65&&_62)||_64){
-var _69=dojo.dom.innerXML(_60);
-if(!_69){
-_69=(_60!=null?"!= null (IE no XMLSerializer)":"null");
+if((!_66&&_63)||_65){
+var _6a=dojo.dom.innerXML(_61);
+if(!_6a){
+_6a=(_61!=null?"!= null (IE no XMLSerializer)":"null");
}
-if(_63==null){
-_63="ajax-api";
+if(_64==null){
+_64="ajax-api";
}
-if(_65){
-dojo.debug(_63+" success url="+_5f+" xml-content="+_69);
+if(_66){
+dojo.debug(_64+" success url="+_60+" xml-content="+_6a);
}else{
-dojo.raise(_63+" failure url="+_5f+" xml-content="+_69);
+dojo.raise(_64+" failure url="+_60+" xml-content="+_6a);
}
}
-return _65;
+return _66;
};
-jetspeed.url._loadingImgUpdate=function(_6a,_6b,_6c,doc,_6e,_6f){
-var _70=_6e.loadingImgProps;
-if(_70){
-var _71=doc.getElementById(_6f.LOADING_INDICATOR_ID);
-if(_71==null||!_71.style||_71.style.display=="none"){
+jetspeed.url._loadingImgUpdate=function(_6b,_6c,_6d,doc,_6f,_70){
+var _71=_6f.loadingImgProps;
+if(_71){
+var _72=doc.getElementById(_70.LOADING_INDICATOR_ID);
+if(_72==null||!_72.style||_72.style.display=="none"){
return;
}
-var _72=_70.imganimated;
-var _73=doc.getElementById(_6f.LOADING_INDICATOR_IMG_ID);
-if(_72&&_73){
-var _74=_70._imgBaseUrl;
-if(_74==null){
-var _75=_70.imgdir;
-if(_75==null||_75.length==0){
-_74=false;
+var _73=_71.imganimated;
+var _74=doc.getElementById(_70.LOADING_INDICATOR_IMG_ID);
+if(_73&&_74){
+var _75=_71._imgBaseUrl;
+if(_75==null){
+var _76=_71.imgdir;
+if(_76==null||_76.length==0){
+_75=false;
}else{
-_74=_6e.getLayoutRootUrl()+_75;
+_75=_6f.getLayoutRootUrl()+_76;
}
-_70._imgBaseUrl=_74;
+_71._imgBaseUrl=_75;
}
-if(_74){
-var _76=false;
-if((_6a||_6c)&&!_70._stepDisabled){
-var _77=_70.imgstepprefix;
-var _78=_70.imgstepextension;
-var _79=_70.imgsteps;
-if(_77&&_78&&_79){
-var _7a=_70._stepNext;
-if(_6b||_7a==null||_7a>=_79.length){
-_7a=0;
+if(_75){
+var _77=false;
+if((_6b||_6d)&&!_71._stepDisabled){
+var _78=_71.imgstepprefix;
+var _79=_71.imgstepextension;
+var _7a=_71.imgsteps;
+if(_78&&_79&&_7a){
+var _7b=_71._stepNext;
+if(_6c||_7b==null||_7b>=_7a.length){
+_7b=0;
}
-var _7b=_74+"/"+_77;
-if(!_6c){
-_73.src=_7b+_79[_7a]+_78;
-_76=true;
-_70._stepNext=_7a+1;
+var _7c=_75+"/"+_78;
+if(!_6d){
+_74.src=_7c+_7a[_7b]+_79;
+_77=true;
+_71._stepNext=_7b+1;
}else{
-var _7c,_7d=Math.ceil(_79.length/1.8);
-for(var i=0;i<=_7d;i++){
-_7c=new Image();
-_7c.src=_7b+_79[i]+_78;
+var _7d,_7e=Math.ceil(_7a.length/1.8);
+for(var i=0;i<=_7e;i++){
+_7d=new Image();
+_7d.src=_7c+_7a[i]+_79;
}
}
}else{
-_70._stepDisabled=true;
+_71._stepDisabled=true;
}
}
-if(!_76&&!_6c){
-_73.src=_74+"/"+_72;
+if(!_77&&!_6d){
+_74.src=_75+"/"+_73;
}
}
}
}
};
-jetspeed.url.loadingIndicatorStep=function(_7f){
-var _80=_7f.url;
-_80._loadingImgUpdate(true,false,false,document,_7f.prefs,_80);
+jetspeed.url.loadingIndicatorStep=function(_80){
+var _81=_80.url;
+_81._loadingImgUpdate(true,false,false,document,_80.prefs,_81);
};
jetspeed.url.loadingIndicatorStepPreload=function(){
-var _81=jetspeed;
-var _82=_81.url;
-_82._loadingImgUpdate(true,false,true,document,_81.prefs,_82);
-};
-jetspeed.url.loadingIndicatorShow=function(_83,_84){
-var _85=jetspeed;
-var _86=_85.prefs;
-var _87=_85.url;
+var _82=jetspeed;
+var _83=_82.url;
+_83._loadingImgUpdate(true,false,true,document,_82.prefs,_83);
+};
+jetspeed.url.loadingIndicatorShow=function(_84,_85){
+var _86=jetspeed;
+var _87=_86.prefs;
+var _88=_86.url;
var doc=document;
-if(typeof _83=="undefined"){
-_83="loadpage";
+if(typeof _84=="undefined"){
+_84="loadpage";
}
-var _89=doc.getElementById(_87.LOADING_INDICATOR_ID);
-if(_89!=null&&_89.style){
-var _8a=null;
-if(_86!=null&&_86.desktopActionLabels!=null){
-_8a=_86.desktopActionLabels[_83];
-}
-if(_8a!=null&&_8a.length>0&&_89.style["display"]=="none"){
-_87._loadingImgUpdate(_84,true,false,doc,_86,_87);
-_89.style["display"]="";
-if(_83!=null){
-if(_8a!=null&&_8a.length>0){
-var _8b=doc.getElementById(_87.LOADING_INDICATOR_ID+"-content");
-if(_8b!=null){
-_8b.innerHTML=_8a;
+var _8a=doc.getElementById(_88.LOADING_INDICATOR_ID);
+if(_8a!=null&&_8a.style){
+var _8b=null;
+if(_87!=null&&_87.desktopActionLabels!=null){
+_8b=_87.desktopActionLabels[_84];
+}
+if(_8b!=null&&_8b.length>0&&_8a.style["display"]=="none"){
+_88._loadingImgUpdate(_85,true,false,doc,_87,_88);
+_8a.style["display"]="";
+if(_84!=null){
+if(_8b!=null&&_8b.length>0){
+var _8c=doc.getElementById(_88.LOADING_INDICATOR_ID+"-content");
+if(_8c!=null){
+_8c.innerHTML=_8b;
}
}
}
@@ -717,42 +724,42 @@
return false;
};
jetspeed.url.loadingIndicatorHide=function(){
-var _8c=document.getElementById(jetspeed.url.LOADING_INDICATOR_ID);
-if(_8c!=null&&_8c.style){
-_8c.style["display"]="none";
+var _8d=document.getElementById(jetspeed.url.LOADING_INDICATOR_ID);
+if(_8d!=null&&_8d.style){
+_8d.style["display"]="none";
}
};
}
-jetspeed.widget.openDialog=function(_8d){
-var _8e=jetspeed.UAmoz;
-if(_8e){
-_8d.domNode.style.position="fixed";
-if(!_8d._fixedIPtBug){
-var _8f=_8d;
-_8f.placeModalDialog=function(){
-var _90=dojo.html.getScroll().offset;
-var _91=dojo.html.getViewport();
+jetspeed.widget.openDialog=function(_8e){
+var _8f=jetspeed.UAmoz;
+if(_8f){
+_8e.domNode.style.position="fixed";
+if(!_8e._fixedIPtBug){
+var _90=_8e;
+_90.placeModalDialog=function(){
+var _91=dojo.html.getScroll().offset;
+var _92=dojo.html.getViewport();
var mb;
-if(_8f.isShowing()){
-mb=dojo.html.getMarginBox(_8f.domNode);
+if(_90.isShowing()){
+mb=dojo.html.getMarginBox(_90.domNode);
}else{
-dojo.html.setVisibility(_8f.domNode,false);
-dojo.html.show(_8f.domNode);
-mb=dojo.html.getMarginBox(_8f.domNode);
-dojo.html.hide(_8f.domNode);
-dojo.html.setVisibility(_8f.domNode,true);
-}
-var x=(_91.width-mb.width)/2;
-var y=(_91.height-mb.height)/2;
-with(_8f.domNode.style){
+dojo.html.setVisibility(_90.domNode,false);
+dojo.html.show(_90.domNode);
+mb=dojo.html.getMarginBox(_90.domNode);
+dojo.html.hide(_90.domNode);
+dojo.html.setVisibility(_90.domNode,true);
+}
+var x=(_92.width-mb.width)/2;
+var y=(_92.height-mb.height)/2;
+with(_90.domNode.style){
left=x+"px";
top=y+"px";
}
};
-_8f._fixedIPtBug=true;
+_90._fixedIPtBug=true;
}
}
-_8d.show();
+_8e.show();
};
jetspeed.initcommon();
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/common.src.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/common.src.js?rev=761615&r1=761614&r2=761615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/common.src.js (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/common.src.js Fri Apr 3 11:13:26 2009
@@ -179,6 +179,14 @@
}
};
+jetspeed.getHead = function()
+{
+ var jsObj = jetspeed;
+ if ( jsObj.docHead == null )
+ jsObj.docHead = document.head || document.getElementsByTagName( "head" )[0];
+ return jsObj.docHead;
+};
+
jetspeed.getBody = function()
{
var jsObj = jetspeed;
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org