[Mapbender-commits] r2265 - branches/2.5/http/javascripts

[svn_mapbender at osgeo.org]

Author: nimix
Date: 2008-03-18 07:11:50 -0400 (Tue, 18 Mar 2008)
New Revision: 2265

Modified:
   branches/2.5/http/javascripts/map.js
Log:


Modified: branches/2.5/http/javascripts/map.js
===================================================================
--- branches/2.5/http/javascripts/map.js	2008-03-18 08:50:05 UTC (rev 2264)
+++ branches/2.5/http/javascripts/map.js	2008-03-18 11:11:50 UTC (rev 2265)
@@ -767,16 +767,14 @@
 						newMapRequest += newMapURL;
 						mb_mapObj[i].mapURL[ii] = newMapURL;	
 						mb_mapObj[i].wms[ii].mapURL = newMapURL;
-						newMapRequest += "' width='"+mb_mapObj[i].width+"' height='"+mb_mapObj[i].height;
-						newMapRequest += "' onError='parent.eventMapRequestFailed.trigger(this);' onAbort='parent.eventMapRequestFailed.trigger(this);' border='0'></div>";   
+						newMapRequest += "' width='"+mb_mapObj[i].width+"' height='"+mb_mapObj[i].height+"' border='0'></div>";   
 					}
 					else{
 						mb_mapObj[i].mapURL[ii] = false;
 						mb_mapObj[i].wms[ii].mapURL = false;
 						newMapRequest += "<div id='" + myDivId + "' style='position:absolute; top:0px; left:0px; z-index:" + ii + "'>";
 						newMapRequest += "<img id='"+myMapId+"' name='mapimage' src='" + mb_trans.src;
-						newMapRequest += "' width='"+mb_mapObj[i].width+"' height='"+mb_mapObj[i].height;
-						newMapRequest += "' onError='parent.eventMapRequestFailed.trigger(this);' onAbort='parent.eventMapRequestFailed.trigger(this);' border='0'>";
+						newMapRequest += "' width='"+mb_mapObj[i].width+"' height='"+mb_mapObj[i].height+"' border='0'>";
 						newMapRequest +="</div>";
 					}
 				}
@@ -878,15 +876,13 @@
 						newMapRequest += newMapURL;
 						mb_mapObj[i].mapURL[ii] = newMapURL;
 						mb_mapObj[i].wms[ii].mapURL = newMapURL;
-						newMapRequest += "' width='"+mb_mapObj[i].width+"' height='"+mb_mapObj[i].height;
-						newMapRequest += "' onError='parent.eventMapRequestFailed.trigger(this);' onAbort='parent.eventMapRequestFailed.trigger(this);' border='0'>";
+						newMapRequest += "' width='"+mb_mapObj[i].width+"' height='"+mb_mapObj[i].height+"' border='0'>";
 					}
 					else{
 						mb_mapObj[i].mapURL[ii] = false;
 						mb_mapObj[i].wms[ii].mapURL = false;
 						newMapRequest = "<img id='"+myMapId+"' name='mapimage' src='" + mb_trans.src;
-						newMapRequest += "' width='"+mb_mapObj[i].width+"' height='"+mb_mapObj[i].height;
-						newMapRequest += "' onError='parent.eventMapRequestFailed.trigger(this);' onAbort='parent.eventMapRequestFailed.trigger(this);' border='0'>";
+						newMapRequest += "' width='"+mb_mapObj[i].width+"' height='"+mb_mapObj[i].height+"' border='0'>";
 					}        
 					//prompt("",newMapRequest);
 					if(mb_log){
@@ -1023,9 +1019,7 @@
 				else if(path && validation){
 					newfeatureInfoRequest += requestParams;
 					try{
-						var p = new mb_popup({title:"Feature Info",
-						url:path+"?url="+escape(newfeatureInfoRequest)+"&"+mb_nr,
-						width:300,height:400,balloon:true,left:x+parseInt(document.getElementById(fName).style.left),top:y+parseInt(document.getElementById(fName).style.top)});
+						var p = new mb_popup("Feature Info","url:"+path + "?url=" + escape(newfeatureInfoRequest)+"&"+mb_nr,300,400);
 						p.show();
 					}catch(e){
 						window.open(path + "?url=" + escape(newfeatureInfoRequest)+"&"+mb_nr, "" , "width=300,height=400,scrollbars=yes,resizable=yes");
@@ -1035,12 +1029,8 @@
 				else if(validation){
 					newfeatureInfoRequest += requestParams;
 					try{
-						var p = new mb_popup({title:"Feature Info",
-						url:newfeatureInfoRequest,balloon:true,
-						width:300,height:200,left:x+parseInt(document.getElementById(fName).style.left),top:y+parseInt(document.getElementById(fName).style.top)});
+						var p = new mb_popup("Feature Info","url:"+newfeatureInfoRequest,300,400);
 						p.show();
-						//var p = new mb_popup("Feature Info","url:"+newfeatureInfoRequest,300,400);
-						//p.show();
 					}
 					catch(e){
 						window.open(newfeatureInfoRequest, "" , "width=300,height=400,scrollbars=yes,resizable=yes");