Author: smilek
Date: Mon Sep 24 12:13:21 2007
New Revision: 578915
URL: http://svn.apache.org/viewvc?rev=578915&view=rev
Log:
desktop overhaul; moved debug code to debug.js
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/common.js
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/common.src.js
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/common.js
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/common.js?rev=578915&r1=578914&r2=578915&view=diff
==============================================================================
---
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/common.js
(original)
+++
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/common.js
Mon Sep 24 12:13:21 2007
@@ -9,41 +9,67 @@
if(!jetspeed.url){
jetspeed.url={};
}
+if(!jetspeed.om){
+jetspeed.om={};
+}
jetspeed.version={major:2,minor:1,patch:0,flag:"dev",revision:"",toString:function(){
with(jetspeed.version){
return major+"."+minor+"."+patch+flag+" ("+revision+")";
}
}};
if(!window.dojo){
-jetspeed.no_dojo_load_notifying=false;
-jetspeed.no_dojo_post_load=false;
-jetspeed.pageLoadedListeners=[];
+var jsObj=jetspeed;
+jsObj.no_dojo_load_notifying=false;
+jsObj.no_dojo_post_load=false;
+jsObj.pageLoadedListeners=[];
window.onload=function(){
if(!window.dojo){
-jetspeed.no_dojo_load_notifying=true;
-jetspeed.no_dojo_post_load=true;
-var _1=jetspeed.pageLoadedListeners;
-for(var x=0;x<_1.length;x++){
-_1[x]();
+var _1=jetspeed;
+_1.no_dojo_load_notifying=true;
+_1.no_dojo_post_load=true;
+var _2=_1.pageLoadedListeners;
+for(var x=0;x<_2.length;x++){
+_2[x]();
}
-jetspeed.pageLoadedListeners=[];
+_1.pageLoadedListeners=[];
}
};
+}else{
+var jsObj=jetspeed;
+var djRH=dojo.render.html;
+if(djRH.mozilla){
+jsObj.UAmoz=true;
+}else{
+if(djRH.ie){
+jsObj.UAie=true;
+if(djRH.ie60||djRH.ie50||djRH.ie55){
+jsObj.UAie6=true;
+}
+}else{
+if(djRH.safari){
+jsObj.UAsaf=true;
+}else{
+if(djRH.opera){
+jsObj.UAope=true;
}
-jetspeed.addOnLoad=function(_3,_4){
+}
+}
+}
+}
+jetspeed.addOnLoad=function(_4,_5){
if(window.dojo){
if(arguments.length==1){
-dojo.addOnLoad(_3);
+dojo.addOnLoad(_4);
}else{
-dojo.addOnLoad(_3,_4);
+dojo.addOnLoad(_4,_5);
}
}else{
if(arguments.length==1){
-jetspeed.pageLoadedListeners.push(_3);
+jetspeed.pageLoadedListeners.push(_4);
}else{
if(arguments.length>1){
jetspeed.pageLoadedListeners.push(function(){
-_3[_4]();
+_4[_5]();
});
}
}
@@ -59,184 +85,59 @@
jetspeed.pageLoaded();
}
};
-jetspeed.printobj=function(_5,_6,_7,_8){
-var _9=[];
-for(var _a in _5){
-try{
-var _b=_5[_a];
-if(_8){
-if(dojo.lang.isArray(_b)){
-_b="["+_b.length+"]";
-}
-}
-_b=_b+"";
-if(!_7||_b.length>0){
-_9.push(_a+": "+_b);
-}
-}
-catch(E){
-_9.push(_a+": ERROR - "+E.message);
-}
-}
-_9.sort();
-var _c="";
-for(var i=0;i<_9.length;i++){
-if(_c.length>0){
-_c+=(_6?", ":"\r\n");
-}
-_c+=_9[i];
-}
-return _c;
-};
-jetspeed.println=function(_e){
-try{
-var _f=jetspeed.getDebugElement();
-if(!_f){
-_f=document.getElementsByTagName("body")[0]||document.body;
-}
-var div=document.createElement("div");
-div.appendChild(document.createTextNode(_e));
-_f.appendChild(div);
-}
-catch(e){
-try{
-document.write("<div>"+_e+"</div>");
-}
-catch(e2){
-window.status=_e;
-}
-}
-};
-jetspeed.debugNodeTree=function(_11,_12){
-if(!_11){
-return;
-}
-if(_12){
-if(_12.length>0){
-jetspeed.println(_12);
-}
-}else{
-jetspeed.println("node: ");
-}
-if(_11.nodeType!=1&&_11.nodeType!=3){
-if(_11.length&&_11.length>0&&(_11[0].nodeType==1||_11[0].nodeType==3)){
-for(var i=0;i<_11.length;i++){
-jetspeed.debugNodeTree(_11[i]," ["+i+"]");
-}
-}else{
-jetspeed.println(" node is not a node! "+_11.length);
-}
-return;
-}
-if(_11.innerXML){
-jetspeed.println(_11.innerXML);
-}else{
-if(_11.xml){
-jetspeed.println(_11.xml);
-}else{
-if(typeof XMLSerializer!="undefined"){
-jetspeed.println((new XMLSerializer()).serializeToString(_11));
-}else{
-jetspeed.println(" node != null (IE no XMLSerializer)");
-}
-}
-}
-};
-jetspeed.debugShallow=function(obj,_15){
-if(_15){
-jetspeed.println(_15);
-}else{
-jetspeed.println("Object: "+obj);
-}
-var _16=[];
-for(var _17 in obj){
-try{
-_16.push(_17+": "+obj[_17]);
-}
-catch(E){
-_16.push(_17+": ERROR - "+E.message);
-}
-}
-_16.sort();
-for(var i=0;i<_16.length;i++){
-jetspeed.println(_16[i]);
-}
-};
-jetspeed.getDebugElement=function(_19){
-var _1a=null;
-try{
-var _1a=document.getElementById("debug_container");
-if(!_1a){
-var _1b=document.getElementsByTagName("body")[0]||document.body;
-var _1a=document.createElement("div");
-_1a.setAttribute("id","debug_container");
-_1b.appendChild(_1a);
-}else{
-if(_19){
-_1a.innerHTML="";
-}
-}
-}
-catch(e){
-try{
-}
-catch(e2){
-}
+jetspeed.getBody=function(){
+var _6=jetspeed;
+if(_6.docBody==null){
+_6.docBody=document.body||document.getElementsByTagName("body")[0];
}
-return _1a;
+return _6.docBody;
};
-if(window.djConfig!=null&&window.djConfig.isDebug){
-var ch=String.fromCharCode(160);
-jetspeed.debugindentch=ch;
-jetspeed.debugindentH=ch+ch;
-jetspeed.debugindent=ch+ch+ch+ch;
-jetspeed.debugindent2=jetspeed.debugindent+jetspeed.debugindent;
-jetspeed.debugindent3=jetspeed.debugindent+jetspeed.debugindent+jetspeed.debugindent;
-}
jetspeed.url.LOADING_INDICATOR_ID="js-showloading";
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(_1c){
-if(!_1c&&jetspeed.url.path.initialized){
+jetspeed.url.pathInitialize=function(_7){
+var _8=jetspeed.url;
+var _9=_8.path;
+if(!_7&&_9.initialized){
return;
}
-var _1d=document.getElementsByTagName("base");
-var _1e=null;
-if(_1d&&_1d.length==1){
-_1e=_1d[0].href;
-}else{
-_1e=window.location.href;
-}
-var _1f=jetspeed.url.parse(_1e);
-var _20=_1f.path;
-var _21=-1;
-for(var _22=1;_21<=_22;_22++){
-_21=_20.indexOf("/",_22);
-if(_21==-1){
+var _a=document.getElementsByTagName("base");
+var _b=null;
+if(_a&&_a.length==1){
+_b=_a[0].href;
+}else{
+_b=window.location.href;
+}
+var _c=_8.parse(_b);
+var _d=_c.path;
+var _e=-1;
+for(var _f=1;_e<=_f;_f++){
+_e=_d.indexOf("/",_f);
+if(_e==-1){
break;
}
}
-var _23="";
-if(_1f.scheme!=null){
-_23+=_1f.scheme+":";
-}
-if(_1f.authority!=null){
-_23+="//"+_1f.authority;
-}
-var _24=null;
-if(_21==-1){
-_24=_20;
-}else{
-_24=_20.substring(0,_21);
-}
-jetspeed.url.path.JETSPEED=_24;
-jetspeed.url.path.SERVER=_23;
-jetspeed.url.path.AJAX_API=jetspeed.url.path.JETSPEED+"/ajaxapi";
-jetspeed.url.path.DESKTOP=jetspeed.url.path.JETSPEED+"/desktop";
-jetspeed.url.path.PORTAL=jetspeed.url.path.JETSPEED+"/portal";
-jetspeed.url.path.PORTLET=jetspeed.url.path.JETSPEED+"/portlet";
-jetspeed.url.path.ACTION=jetspeed.url.path.JETSPEED+"/action";
-jetspeed.url.path.RENDER=jetspeed.url.path.JETSPEED+"/render";
-jetspeed.url.path.initialized=true;
+var _10="";
+if(_c.scheme!=null){
+_10+=_c.scheme+":";
+}
+if(_c.authority!=null){
+_10+="//"+_c.authority;
+}
+var _11=null;
+if(_e==-1){
+_11=_d;
+}else{
+_11=_d.substring(0,_e);
+}
+_9.JETSPEED=_11;
+_9.SERVER=_10;
+_9.AJAX_API=_9.JETSPEED+"/ajaxapi";
+_9.DESKTOP=_9.JETSPEED+"/desktop";
+_9.PORTAL=_9.JETSPEED+"/portal";
+_9.PORTLET=_9.JETSPEED+"/portlet";
+_9.ACTION=_9.JETSPEED+"/action";
+_9.RENDER=_9.JETSPEED+"/render";
+_9.initialized=true;
};
jetspeed.url.parse=function(url){
if(url==null){
@@ -250,9 +151,9 @@
jetspeed.url.JSUri=function(url){
if(url!=null){
if(!url.path){
-var _27="^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$";
-var r=url.toString().match(new RegExp(_27));
-var _29={};
+var _14="^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$";
+var r=url.toString().match(new RegExp(_14));
+var _16={};
this.scheme=r[2]||(r[1]?"":null);
this.authority=r[4]||(r[3]?"":null);
this.path=r[5];
@@ -279,8 +180,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 _2b=window.djConfig.jetspeed.servletPath;
-if(_2b!=null&&_2b.toLowerCase().indexOf("/desktop")==0){
+var _18=window.djConfig.jetspeed.servletPath;
+if(_18!=null&&_18.toLowerCase().indexOf("/desktop")==0){
return false;
}
}
@@ -308,247 +209,268 @@
}
return jetspeed.url.basePortalUrl()+jetspeed.url.path.JETSPEED;
};
-jetspeed.url.addPath=function(url,_2d){
-if(_2d==null||_2d.length==0){
+jetspeed.url.addPath=function(url,_1a){
+if(_1a==null||_1a.length==0){
return url;
}
-var _2e=new jetspeed.url.JSUri(url);
-var _2f=_2e.path;
-if(_2f!=null&&_2f.length>0){
-if(_2e.path.charCodeAt(_2f.length-1)==47){
-if(_2d.charCodeAt(0)==47){
-if(_2d.length>1){
-_2e.path+=_2d.substring(1);
+var _1b=new jetspeed.url.JSUri(url);
+var _1c=_1b.path;
+if(_1c!=null&&_1c.length>0){
+if(_1b.path.charCodeAt(_1c.length-1)==47){
+if(_1a.charCodeAt(0)==47){
+if(_1a.length>1){
+_1b.path+=_1a.substring(1);
}
}else{
-_2e.path+=_2d;
+_1b.path+=_1a;
}
}else{
-if(_2d.charCodeAt(0)==47){
-_2e.path+=_2d;
+if(_1a.charCodeAt(0)==47){
+_1b.path+=_1a;
}else{
-if(_2d.length>1){
-_2e.path+="/"+_2d;
+if(_1a.length>1){
+_1b.path+="/"+_1a;
}
}
}
}
-var _30=jetspeed.url.parse(_2e);
-return _30.toString();
+var _1d=jetspeed.url.parse(_1b);
+return _1d.toString();
};
-jetspeed.url.validateUrlStartsWithHttp=function(url){
+jetspeed.url.urlStartsWithHttp=function(url){
if(url){
var len=url.length;
-var _33=jetspeed.url.scheme.HTTPS_PREFIX_LEN;
-if(len>_33){
-var _34=jetspeed.url.scheme.HTTP_PREFIX_LEN;
-if(url.substring(0,_34)==jetspeed.url.scheme.HTTP_PREFIX){
+var _20=jetspeed.url.scheme.HTTPS_PREFIX_LEN;
+if(len>_20){
+var _21=jetspeed.url.scheme.HTTP_PREFIX_LEN;
+if(url.substring(0,_21)==jetspeed.url.scheme.HTTP_PREFIX){
return true;
}
-if(url.substring(0,_33)==jetspeed.url.scheme.HTTPS_PREFIX){
+if(url.substring(0,_20)==jetspeed.url.scheme.HTTPS_PREFIX){
return true;
}
}
}
return false;
};
-jetspeed.url.addQueryParameter=function(_35,_36,_37,_38){
-if(_35==null){
-return _35;
+jetspeed.url.addQueryParameter=function(_22,_23,_24,_25){
+if(_22==null){
+return _22;
}
-if(!_35.path){
-_35=jetspeed.url.parse(_35);
+if(!_22.path){
+_22=jetspeed.url.parse(_22);
}
-if(_35==null){
+if(_22==null){
return null;
}
-if(_36==null){
-return _35;
-}
-_35.jsQParamN=null;
-if(_38){
-_35=jetspeed.url.removeQueryParameter(_35,_36,false);
-}
-var _39=_35.query;
-if(_39==null){
-_39="";
-}
-var _3a=_39.length;
-if(_3a>0){
-_39+="&";
+if(_23==null){
+return _22;
}
-_39+=_36+"="+(_37!=null?_37:"");
-_35.query=_39;
-var _3b=new jetspeed.url.JSUri(_35);
-_35=jetspeed.url.parse(_3b);
-return _35;
-};
-jetspeed.url.removeAllQueryParameters=function(_3c){
-return jetspeed.url.removeQueryParameter(_3c,null,true);
-};
-jetspeed.url.removeQueryParameter=function(_3d,_3e,_3f){
-if(_3d==null){
-return _3d;
+_22.jsQParamN=null;
+if(_25){
+_22=jetspeed.url.removeQueryParameter(_22,_23,false);
+}
+var _26=_22.query;
+if(_26==null){
+_26="";
+}
+var _27=_26.length;
+if(_27>0){
+_26+="&";
+}
+_26+=_23+"="+(_24!=null?_24:"");
+_22.query=_26;
+var _28=new jetspeed.url.JSUri(_22);
+_22=jetspeed.url.parse(_28);
+return _22;
+};
+jetspeed.url.removeAllQueryParameters=function(_29){
+return jetspeed.url.removeQueryParameter(_29,null,true);
+};
+jetspeed.url.removeQueryParameter=function(_2a,_2b,_2c){
+if(_2a==null){
+return _2a;
}
-if(!_3d.path){
-_3d=jetspeed.url.parse(_3d);
+if(!_2a.path){
+_2a=jetspeed.url.parse(_2a);
}
-if(_3d==null){
+if(_2a==null){
return null;
}
-_3d.jsQParamN=null;
-var _40=_3d.query;
-var _41=((_40!=null)?_40.length:0);
-if(_41>0){
-if(_3f){
-_40=null;
-}else{
-if(_3e==null){
-return _3d;
-}else{
-var _42=_3e;
-var _43=_40.indexOf(_42);
-if(_43==0){
-_40=jetspeed.url._removeQP(_40,_41,_42,_43);
+_2a.jsQParamN=null;
+var _2d=_2a.query;
+var _2e=((_2d!=null)?_2d.length:0);
+if(_2e>0){
+if(_2c){
+_2d=null;
+}else{
+if(_2b==null){
+return _2a;
+}else{
+var _2f=_2b;
+var _30=_2d.indexOf(_2f);
+if(_30==0){
+_2d=jetspeed.url._removeQP(_2d,_2e,_2f,_30);
}
-_42="&"+_3e;
+_2f="&"+_2b;
while(true){
-_41=((_40!=null)?_40.length:0);
-_43=_40.indexOf(_42,0);
-if(_43==-1){
+_2e=((_2d!=null)?_2d.length:0);
+_30=_2d.indexOf(_2f,0);
+if(_30==-1){
break;
}
-var _44=jetspeed.url._removeQP(_40,_41,_42,_43);
-if(_44==_40){
+var _31=jetspeed.url._removeQP(_2d,_2e,_2f,_30);
+if(_31==_2d){
break;
}
-_40=_44;
+_2d=_31;
}
-if(_40.length>0){
-if(_40.charCodeAt(0)==38){
-_40=((_40.length>1)?_40.substring(1):"");
+if(_2d.length>0){
+if(_2d.charCodeAt(0)==38){
+_2d=((_2d.length>1)?_2d.substring(1):"");
}
-if(_40.length>0&&_40.charCodeAt(0)==63){
-_40=((_40.length>1)?_40.substring(1):"");
+if(_2d.length>0&&_2d.charCodeAt(0)==63){
+_2d=((_2d.length>1)?_2d.substring(1):"");
}
}
}
}
-_3d.query=_40;
-var _45=new jetspeed.url.JSUri(_3d);
-_3d=jetspeed.url.parse(_45);
+_2a.query=_2d;
+var _32=new jetspeed.url.JSUri(_2a);
+_2a=jetspeed.url.parse(_32);
}
-return _3d;
+return _2a;
};
-jetspeed.url._removeQP=function(_46,_47,_48,_49){
-if(_49==-1){
-return _46;
+jetspeed.url._removeQP=function(_33,_34,_35,_36){
+if(_36==-1){
+return _33;
}
-if(_47>(_49+_48.length)){
-var _4a=_46.charCodeAt(_49+_48.length);
-if(_4a==61){
-var _4b=_46.indexOf("&",_49+_48.length+1);
-if(_4b!=-1){
-if(_49>0){
-_46=_46.substring(0,_49)+_46.substring(_4b);
+if(_34>(_36+_35.length)){
+var _37=_33.charCodeAt(_36+_35.length);
+if(_37==61){
+var _38=_33.indexOf("&",_36+_35.length+1);
+if(_38!=-1){
+if(_36>0){
+_33=_33.substring(0,_36)+_33.substring(_38);
}else{
-_46=((_4b<(_47-1))?_46.substring(_4b):"");
+_33=((_38<(_34-1))?_33.substring(_38):"");
}
}else{
-if(_49>0){
-_46=_46.substring(0,_49);
+if(_36>0){
+_33=_33.substring(0,_36);
}else{
-_46="";
+_33="";
}
}
}else{
-if(_4a==38){
-if(_49>0){
-_46=_46.substring(0,_49)+_46.substring(_49+_48.length);
+if(_37==38){
+if(_36>0){
+_33=_33.substring(0,_36)+_33.substring(_36+_35.length);
}else{
-_46=_46.substring(_49+_48.length);
+_33=_33.substring(_36+_35.length);
}
}
}
}else{
-if(_47==(_49+_48.length)){
-_46="";
+if(_34==(_36+_35.length)){
+_33="";
}
}
-return _46;
+return _33;
};
-jetspeed.url.getQueryParameter=function(_4c,_4d){
-if(_4c==null){
+jetspeed.url.getQueryParameter=function(_39,_3a){
+if(_39==null){
return null;
}
-if(!_4c.authority||!_4c.scheme){
-_4c=jetspeed.url.parse(_4c);
+if(!_39.authority||!_39.scheme){
+_39=jetspeed.url.parse(_39);
}
-if(_4c==null){
+if(_39==null){
return null;
}
-if(_4c.jsQParamN==null&&_4c.query){
-var _4e=new Array();
-var _4f=_4c.query.split("&");
-for(var i=0;i<_4f.length;i++){
-if(_4f[i]==null){
-_4f[i]="";
-}
-var _51=_4f[i].indexOf("=");
-if(_51>0&&_51<(_4f[i].length-1)){
-_4e[i]=unescape(_4f[i].substring(_51+1));
-_4f[i]=unescape(_4f[i].substring(0,_51));
-}else{
-_4e[i]="";
-}
-}
-_4c.jsQParamN=_4f;
-_4c.jsQParamV=_4e;
-}
-if(_4c.jsQParamN!=null){
-for(var i=0;i<_4c.jsQParamN.length;i++){
-if(_4c.jsQParamN[i]==_4d){
-return _4c.jsQParamV[i];
+if(_39.jsQParamN==null&&_39.query){
+var _3b=new Array();
+var _3c=_39.query.split("&");
+for(var i=0;i<_3c.length;i++){
+if(_3c[i]==null){
+_3c[i]="";
+}
+var _3e=_3c[i].indexOf("=");
+if(_3e>0&&_3e<(_3c[i].length-1)){
+_3b[i]=unescape(_3c[i].substring(_3e+1));
+_3c[i]=unescape(_3c[i].substring(0,_3e));
+}else{
+_3b[i]="";
+}
+}
+_39.jsQParamN=_3c;
+_39.jsQParamV=_3b;
+}
+if(_39.jsQParamN!=null){
+for(var i=0;i<_39.jsQParamN.length;i++){
+if(_39.jsQParamN[i]==_3a){
+return _39.jsQParamV[i];
}
}
}
return null;
};
+jetspeed.om.Id=function(){
+var _3f="";
+for(var i=0;i<arguments.length;i++){
+if(dojo.lang.isString(arguments[i])){
+if(_3f.length>0){
+_3f+="-";
+}
+_3f+=arguments[i];
+}else{
+if(dojo.lang.isObject(arguments[i])){
+for(var _41 in arguments[i]){
+this[_41]=arguments[i][_41];
+}
+}
+}
+}
+this.id=_3f;
+};
+jetspeed.om.Id.prototype={getId:function(){
+return this.id;
+}};
if(window.dojo){
-jetspeed.url.BindArgs=function(_52){
-dojo.lang.mixin(this,_52);
+jetspeed.url.BindArgs=function(_42){
+dojo.lang.mixin(this,_42);
if(!this.mimetype){
this.mimetype="text/html";
}
};
dojo.lang.extend(jetspeed.url.BindArgs,{createIORequest:function(){
-var _53=new dojo.io.Request(this.url,this.mimetype);
-_53.fromKwArgs(this);
-return _53;
-},load:function(_54,_55,_56){
+var _43=new dojo.io.Request(this.url,this.mimetype);
+_43.fromKwArgs(this);
+return _43;
+},load:function(_44,_45,_46){
try{
-var _57=null;
+var _47=null;
if(this.debugContentDumpIds){
-_57=((this.domainModelObject&&dojo.lang.isFunction(this.domainModelObject.getId))?this.domainModelObject.getId():"");
-for(var _58=0;_58<this.debugContentDumpIds.length;_58++){
-if(_57.match(new RegExp(this.debugContentDumpIds[_58]))){
-if(dojo.lang.isString(_55)){
-dojo.debug("retrieveContent ["+(_57?_57:this.url)+"] content: "+_55);
-}else{
-var _59=dojo.dom.innerXML(_55);
-if(!_59){
-_59=(_55!=null?"!= null (IE no XMLSerializer)":"null");
+_47=((this.domainModelObject&&dojo.lang.isFunction(this.domainModelObject.getId))?this.domainModelObject.getId():((this.domainModelObject&&this.domainModelObject.id)?String(this.domainModelObject.id):""));
+for(var _48=0;_48<this.debugContentDumpIds.length;_48++){
+if(_47.match(new RegExp(this.debugContentDumpIds[_48]))){
+if(dojo.lang.isString(_45)){
+dojo.debug("retrieveContent ["+(_47?_47:this.url)+"] content: "+_45);
+}else{
+var _49=dojo.dom.innerXML(_45);
+if(!_49){
+_49=(_45!=null?"!= null (IE no XMLSerializer)":"null");
}
-dojo.debug("retrieveContent ["+(_57?_57:this.url)+"] xml-content: "+_59);
+dojo.debug("retrieveContent ["+(_47?_47:this.url)+"] xml-content: "+_49);
}
}
}
}
if(this.contentListener&&dojo.lang.isFunction(this.contentListener.notifySuccess)){
-this.contentListener.notifySuccess(_55,this.url,this.domainModelObject,_56);
+this.contentListener.notifySuccess(_45,this.url,this.domainModelObject,_46);
}else{
-_57=((this.domainModelObject&&dojo.lang.isFunction(this.domainModelObject.getId))?this.domainModelObject.getId():"");
-dojo.debug("retrieveContent ["+(_57?_57:this.url)+"] no valid
contentListener");
+_47=((this.domainModelObject&&dojo.lang.isFunction(this.domainModelObject.getId))?this.domainModelObject.getId():"");
+dojo.debug("retrieveContent ["+(_47?_47:this.url)+"] no valid
contentListener");
}
if(this.hideLoadingIndicator){
jetspeed.url.loadingIndicatorHide();
@@ -560,10 +482,10 @@
}
throw e;
}
-},error:function(_5a,_5b){
+},error:function(_4a,_4b){
try{
if(this.contentListener&&dojo.lang.isFunction(this.contentListener.notifyFailure)){
-this.contentListener.notifyFailure(_5a,_5b,this.url,this.domainModelObject);
+this.contentListener.notifyFailure(_4a,_4b,this.url,this.domainModelObject);
}
if(this.hideLoadingIndicator){
jetspeed.url.loadingIndicatorHide();
@@ -576,84 +498,84 @@
throw e;
}
}});
-jetspeed.url.retrieveContent=function(_5c,_5d,_5e,_5f){
-if(!_5c){
-_5c={};
-}
-_5c.contentListener=_5d;
-_5c.domainModelObject=_5e;
-_5c.debugContentDumpIds=_5f;
-var _60=new jetspeed.url.BindArgs(_5c);
-if(_5c.showLoadingIndicator||(_5d&&!_5d.suppressLoadingIndicator&&_5c.showLoadingIndicator!=false)){
+jetspeed.url.retrieveContent=function(_4c,_4d,_4e,_4f){
+if(!_4c){
+_4c={};
+}
+_4c.contentListener=_4d;
+_4c.domainModelObject=_4e;
+_4c.debugContentDumpIds=_4f;
+var _50=new jetspeed.url.BindArgs(_4c);
+if(_4c.showLoadingIndicator||(_4d&&!_4d.suppressLoadingIndicator&&_4c.showLoadingIndicator!=false)){
if(jetspeed.url.loadingIndicatorShow()){
-_60.hideLoadingIndicator=true;
+_50.hideLoadingIndicator=true;
}
}
-dojo.io.bind(_60.createIORequest());
+dojo.io.bind(_50.createIORequest());
};
-jetspeed.url.checkAjaxApiResponse=function(_61,_62,_63,_64,_65){
-var _66=false;
-var _67=_62.getElementsByTagName("status");
-if(_67!=null){
-var _68=_67[0].firstChild.nodeValue;
-if(_68=="success"){
-_66=true;
+jetspeed.url.checkAjaxApiResponse=function(_51,_52,_53,_54,_55){
+var _56=false;
+var _57=_52.getElementsByTagName("status");
+if(_57!=null){
+var _58=_57[0].firstChild.nodeValue;
+if(_58=="success"){
+_56=true;
}
}
-if((!_66&&_63)||_65){
-var _69=dojo.dom.innerXML(_62);
-if(!_69){
-_69=(_62!=null?"!= null (IE no XMLSerializer)":"null");
+if((!_56&&_53)||_55){
+var _59=dojo.dom.innerXML(_52);
+if(!_59){
+_59=(_52!=null?"!= null (IE no XMLSerializer)":"null");
}
-if(_64==null){
-_64="ajax-api";
+if(_54==null){
+_54="ajax-api";
}
-if(_66){
-dojo.debug(_64+" success url="+_61+" xml-content="+_69);
+if(_56){
+dojo.debug(_54+" success url="+_51+" xml-content="+_59);
}else{
-dojo.raise(_64+" failure url="+_61+" xml-content="+_69);
+dojo.raise(_54+" failure url="+_51+" xml-content="+_59);
}
}
-return _66;
+return _56;
};
-jetspeed.url.formatBindError=function(_6a){
-if(_6a==null){
+jetspeed.url.formatBindError=function(_5a){
+if(_5a==null){
return "";
}
var msg=" error:";
-if(_6a.message!=null){
-msg+=" "+_6a.message;
+if(_5a.message!=null){
+msg+=" "+_5a.message;
}
-if(_6a.number!=null&&_6a.number!="0"){
-msg+=" ("+_6a.number;
-if(_6a.type!=null&&_6a.type!="unknown"){
-msg+="/"+_6a.type;
+if(_5a.number!=null&&_5a.number!="0"){
+msg+=" ("+_5a.number;
+if(_5a.type!=null&&_5a.type!="unknown"){
+msg+="/"+_5a.type;
}
msg+=")";
}else{
-if(_6a.type!=null&&_6a.type!="unknown"){
-msg+=" ("+_6a.type+")";
+if(_5a.type!=null&&_5a.type!="unknown"){
+msg+=" ("+_5a.type+")";
}
}
return msg;
};
-jetspeed.url.loadingIndicatorShow=function(_6c){
-if(typeof _6c=="undefined"){
-_6c="loadpage";
-}
-var _6d=document.getElementById(jetspeed.url.LOADING_INDICATOR_ID);
-if(_6d!=null&&_6d.style){
-var _6e=null;
+jetspeed.url.loadingIndicatorShow=function(_5c){
+if(typeof _5c=="undefined"){
+_5c="loadpage";
+}
+var _5d=document.getElementById(jetspeed.url.LOADING_INDICATOR_ID);
+if(_5d!=null&&_5d.style){
+var _5e=null;
if(jetspeed.prefs!=null&&jetspeed.prefs.desktopActionLabels!=null){
-_6e=jetspeed.prefs.desktopActionLabels[_6c];
+_5e=jetspeed.prefs.desktopActionLabels[_5c];
}
-if(_6e!=null&&_6e.length>0&&_6d.style["display"]=="none"){
-_6d.style["display"]="";
-if(_6c!=null){
-if(_6e!=null&&_6e.length>0){
-var _6f=document.getElementById(jetspeed.url.LOADING_INDICATOR_ID+"-content");
-if(_6f!=null){
-_6f.innerHTML=_6e;
+if(_5e!=null&&_5e.length>0&&_5d.style["display"]=="none"){
+_5d.style["display"]="";
+if(_5c!=null){
+if(_5e!=null&&_5e.length>0){
+var _5f=document.getElementById(jetspeed.url.LOADING_INDICATOR_ID+"-content");
+if(_5f!=null){
+_5f.innerHTML=_5e;
}
}
}
@@ -663,9 +585,9 @@
return false;
};
jetspeed.url.loadingIndicatorHide=function(){
-var _70=document.getElementById(jetspeed.url.LOADING_INDICATOR_ID);
-if(_70!=null&&_70.style){
-_70.style["display"]="none";
+var _60=document.getElementById(jetspeed.url.LOADING_INDICATOR_ID);
+if(_60!=null&&_60.style){
+_60.style["display"]="none";
}
};
}
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/common.src.js
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/common.src.js?rev=578915&r1=578914&r2=578915&view=diff
==============================================================================
---
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/common.src.js
(original)
+++
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/common.src.js
Mon Sep 24 12:13:21 2007
@@ -26,13 +26,19 @@
dojo.require( "dojo.uri.Uri" );
}
-// ... jetspeed base objects
+
+// jetspeed base objects
+
if ( ! window.jetspeed )
jetspeed = {};
if ( ! jetspeed.url )
jetspeed.url = {};
+if ( ! jetspeed.om )
+ jetspeed.om = {};
+
+
+// jetspeed version
-// ... jetspeed version
jetspeed.version =
{
major: 2, minor: 1, patch: 0, flag: "dev",
@@ -48,31 +54,49 @@
if ( ! window.dojo )
{
- jetspeed.no_dojo_load_notifying = false;
- jetspeed.no_dojo_post_load = false;
- jetspeed.pageLoadedListeners = [];
+ var jsObj = jetspeed;
+ jsObj.no_dojo_load_notifying = false;
+ jsObj.no_dojo_post_load = false;
+ jsObj.pageLoadedListeners = [];
window.onload = function()
{
if ( ! window.dojo )
{
- jetspeed.no_dojo_load_notifying = true;
- jetspeed.no_dojo_post_load = true;
- var pll = jetspeed.pageLoadedListeners;
+ var _jsObj = jetspeed;
+ _jsObj.no_dojo_load_notifying = true;
+ _jsObj.no_dojo_post_load = true;
+ var pll = _jsObj.pageLoadedListeners;
for( var x=0; x < pll.length; x++ )
{
pll[x]();
}
- jetspeed.pageLoadedListeners = [];
+ _jsObj.pageLoadedListeners = [];
}
};
-};
+}
+else
+{
+ var jsObj = jetspeed;
+ var djRH = dojo.render.html;
+ if ( djRH.mozilla )
+ jsObj.UAmoz = true;
+ else if ( djRH.ie )
+ {
+ jsObj.UAie = true;
+ if ( djRH.ie60 || djRH.ie50 || djRH.ie55 )
+ jsObj.UAie6 = true;
+ }
+ else if ( djRH.safari )
+ jsObj.UAsaf = true ;
+ else if ( djRH.opera )
+ jsObj.UAope = true ;
+}
+
-/*
-Call styles:
- jetspeed.addOnLoad( functionPointer )
- jetspeed.addOnLoad( object, "functionName" )
-*/
+// Call styles:
+// jetspeed.addOnLoad( functionPointer )
+// jetspeed.addOnLoad( object, "functionName" )
jetspeed.addOnLoad = function( obj, fcnName )
{
if ( window.dojo )
@@ -114,165 +138,16 @@
}
};
-jetspeed.printobj = function( obj, omitLineBreaks, omitEmptyValsProperties,
arrayLengthsOnly )
-{
- var props = [];
- for( var prop in obj )
- {
- try
- {
- var propVal = obj[prop];
- if ( arrayLengthsOnly )
- {
- if ( dojo.lang.isArray( propVal ) )
- {
- propVal = "[" + propVal.length + "]";
- }
- }
- propVal = propVal + "";
- if ( ! omitEmptyValsProperties || propVal.length > 0 )
- props.push( prop + ': ' + propVal );
- }
- catch(E)
- {
- props.push( prop + ': ERROR - ' + E.message );
- }
- }
- props.sort();
- var buff = "";
- for( var i = 0; i < props.length; i++ )
- {
- if ( buff.length > 0 )
- buff += ( omitLineBreaks ? ", " : "\r\n" );
- buff += props[i];
- }
- return buff;
-};
-
-jetspeed.println = function( line )
-{
- try
- {
- var console = jetspeed.getDebugElement();
- if( !console )
- {
- console = document.getElementsByTagName( "body" )[0] ||
document.body;
- }
- var div = document.createElement( "div" );
- div.appendChild( document.createTextNode( line ) );
- console.appendChild( div );
- }
- catch (e)
- {
- try
- { // safari needs the output wrapped in an element for some reason
- document.write("<div>" + line + "</div>");
- }
- catch(e2)
- {
- window.status = line;
- }
- }
-};
-
-jetspeed.debugNodeTree = function( node, string )
-{
- if ( ! node ) return ;
-
- if ( string )
- {
- if ( string.length > 0 )
- jetspeed.println( string );
- }
- else
- {
- jetspeed.println( 'node: ' );
- }
- if ( node.nodeType != 1 && node.nodeType != 3 )
- {
- if ( node.length && node.length > 0 && ( node[0].nodeType == 1 ||
node[0].nodeType == 3 ) )
- {
- for ( var i = 0 ; i < node.length ; i++ )
- {
- jetspeed.debugNodeTree( node[i], " [" + i + "]" )
- }
- }
- else
- {
- jetspeed.println( " node is not a node! " + node.length );
- }
- return ;
- }
- if ( node.innerXML )
- {
- jetspeed.println( node.innerXML );
- }
- else if ( node.xml )
- {
- jetspeed.println( node.xml );
- }
- else if ( typeof XMLSerializer != "undefined" )
- {
- jetspeed.println( (new XMLSerializer()).serializeToString( node ) );
- }
- else
- {
- jetspeed.println( " node != null (IE no XMLSerializer)" );
- }
-};
-jetspeed.debugShallow = function( obj, string )
+jetspeed.getBody = function()
{
- if ( string )
- jetspeed.println( string );
- else
- jetspeed.println( 'Object: ' + obj );
- var props = [];
- for(var prop in obj){
- try {
- props.push(prop + ': ' + obj[prop]);
- } catch(E) {
- props.push(prop + ': ERROR - ' + E.message);
- }
- }
- props.sort();
- for(var i = 0; i < props.length; i++) {
- jetspeed.println( props[i] );
- }
+ var jsObj = jetspeed;
+ if ( jsObj.docBody == null )
+ jsObj.docBody = document.body || document.getElementsByTagName( "body"
)[0];
+ return jsObj.docBody;
};
-jetspeed.getDebugElement = function( clear )
-{
- var console = null ;
- try {
- var console = document.getElementById("debug_container");
- if(!console)
- {
- var consoleContainer = document.getElementsByTagName("body")[0] ||
document.body;
- var console = document.createElement("div");
- console.setAttribute( "id", "debug_container" );
- consoleContainer.appendChild(console);
- }
- else if ( clear )
- {
- console.innerHTML = "";
- }
- } catch (e) {
- try {
- } catch(e2){}
- }
- return console ;
-};
-if ( window.djConfig != null && window.djConfig.isDebug )
-{
- var ch = String.fromCharCode(0x00a0);
- jetspeed.debugindentch = ch;
- jetspeed.debugindentH = ch + ch;
- jetspeed.debugindent = ch + ch + ch + ch;
- jetspeed.debugindent2 = jetspeed.debugindent + jetspeed.debugindent;
- jetspeed.debugindent3 = jetspeed.debugindent + jetspeed.debugindent +
jetspeed.debugindent;
-}
+// jetspeed.url
-// ... jetspeed.url
jetspeed.url.LOADING_INDICATOR_ID = "js-showloading";
jetspeed.url.path =
{
@@ -289,7 +164,9 @@
jetspeed.url.pathInitialize = function( force )
{
- if ( ! force && jetspeed.url.path.initialized ) return;
+ var jsU = jetspeed.url;
+ var jsUP = jsU.path;
+ if ( ! force && jsUP.initialized ) return;
var baseTags = document.getElementsByTagName( "base" );
var baseTagHref = null;
@@ -298,7 +175,7 @@
else
baseTagHref = window.location.href;
- var baseTag = jetspeed.url.parse( baseTagHref );
+ var baseTag = jsU.parse( baseTagHref );
var basePath = baseTag.path;
@@ -320,18 +197,18 @@
else
jetspeedPath = basePath.substring( 0, sepPos );
- //dojo.debug( "pathInitialize new-JETSPEED=" + jetspeedPath + "
orig-JETSPEED=" + jetspeed.url.path.JETSPEED + " new-SERVER=" + serverUri + "
orig-SERVER=" + document.location.protocol + "//" + document.location.host );
+ //dojo.debug( "pathInitialize new-JETSPEED=" + jetspeedPath + "
orig-JETSPEED=" + jsUP.JETSPEED + " new-SERVER=" + serverUri + " orig-SERVER="
+ document.location.protocol + "//" + document.location.host );
- jetspeed.url.path.JETSPEED = jetspeedPath;
- jetspeed.url.path.SERVER = serverUri;
- jetspeed.url.path.AJAX_API = jetspeed.url.path.JETSPEED + "/ajaxapi";
- jetspeed.url.path.DESKTOP = jetspeed.url.path.JETSPEED + "/desktop";
- jetspeed.url.path.PORTAL = jetspeed.url.path.JETSPEED + "/portal";
- jetspeed.url.path.PORTLET = jetspeed.url.path.JETSPEED + "/portlet";
- jetspeed.url.path.ACTION = jetspeed.url.path.JETSPEED + "/action";
- jetspeed.url.path.RENDER = jetspeed.url.path.JETSPEED + "/render";
+ jsUP.JETSPEED = jetspeedPath;
+ jsUP.SERVER = serverUri;
+ jsUP.AJAX_API = jsUP.JETSPEED + "/ajaxapi";
+ jsUP.DESKTOP = jsUP.JETSPEED + "/desktop";
+ jsUP.PORTAL = jsUP.JETSPEED + "/portal";
+ jsUP.PORTLET = jsUP.JETSPEED + "/portlet";
+ jsUP.ACTION = jsUP.JETSPEED + "/action";
+ jsUP.RENDER = jsUP.JETSPEED + "/render";
- jetspeed.url.path.initialized = true;
+ jsUP.initialized = true;
};
jetspeed.url.parse = function( url )
{ // taken from dojo.uri.Uri
@@ -385,7 +262,7 @@
}
};
jetspeed.url.scheme =
-{ // used to make jetspeed.url.validateUrlStartsWithHttp cleaner
+{ // used to make jetspeed.url.urlStartsWithHttp cleaner
HTTP_PREFIX: "http://";,
HTTP_PREFIX_LEN: "http://".length,
HTTPS_PREFIX: "https://";,
@@ -460,7 +337,7 @@
var urlObj = jetspeed.url.parse( modUri );
return urlObj.toString();
};
-jetspeed.url.validateUrlStartsWithHttp = function( url )
+jetspeed.url.urlStartsWithHttp = function( url )
{
if ( url )
{
@@ -640,6 +517,38 @@
return null;
};
+
+// jetspeed.om.Id
+
+jetspeed.om.Id = function( /* ... */ ) // intended as a simple, general
object with an id and a getId() function
+{
+ var idBuff = "";
+ for ( var i = 0; i < arguments.length; i++ )
+ {
+ if( dojo.lang.isString( arguments[i] ) )
+ {
+ if ( idBuff.length > 0 )
+ idBuff += "-";
+ idBuff += arguments[i];
+ }
+ else if ( dojo.lang.isObject( arguments[i] ) )
+ {
+ for ( var slotKey in arguments[i] )
+ {
+ this[ slotKey ] = arguments[i][slotKey];
+ }
+ }
+ }
+ this.id = idBuff;
+};
+jetspeed.om.Id.prototype =
+{
+ getId: function()
+ {
+ return this.id;
+ }
+};
+
if ( window.dojo )
{
jetspeed.url.BindArgs = function( bindArgs )
@@ -672,7 +581,7 @@
var dmId = null;
if ( this.debugContentDumpIds )
{
- dmId = ( ( this.domainModelObject && dojo.lang.isFunction(
this.domainModelObject.getId ) ) ? this.domainModelObject.getId() : "" );
+ dmId = ( ( this.domainModelObject && dojo.lang.isFunction(
this.domainModelObject.getId ) ) ? this.domainModelObject.getId() : ( (
this.domainModelObject && this.domainModelObject.id ) ? String(
this.domainModelObject.id ) : "" ) );
for ( var debugContentIndex = 0 ; debugContentIndex <
this.debugContentDumpIds.length; debugContentIndex++ )
{
if ( dmId.match( new RegExp( this.debugContentDumpIds[
debugContentIndex ] ) ) )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
