[Mapbender-commits] r5039 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-11-25 08:11:35 -0500 (Wed, 25 Nov 2009)
New Revision: 5039

Modified:
   trunk/mapbender/http/javascripts/mod_georss.php
   trunk/mapbender/http/javascripts/usemap.js
Log:


Modified: trunk/mapbender/http/javascripts/mod_georss.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_georss.php	2009-11-25 13:11:01 UTC (rev 5038)
+++ trunk/mapbender/http/javascripts/mod_georss.php	2009-11-25 13:11:35 UTC (rev 5039)
@@ -109,7 +109,6 @@
 						
 
 					eventAfterMapRequest.register(function () {
-						console.log("fired");
 						georssHighlighter.paint();
 					});
 					eventAfterMapRequest.register("georssUsemap.setUsemap();");

Modified: trunk/mapbender/http/javascripts/usemap.js
===================================================================
--- trunk/mapbender/http/javascripts/usemap.js	2009-11-25 13:11:01 UTC (rev 5038)
+++ trunk/mapbender/http/javascripts/usemap.js	2009-11-25 13:11:35 UTC (rev 5039)
@@ -28,7 +28,6 @@
 	
 	//(re)generate Usemap
 	this.setUsemap = function(){
-		
 		//first clean the Usemap
 		this.hide();
 		
@@ -38,11 +37,11 @@
 		var actualDoc;
 		
 		//go throught the maps
-		for(var t=0;t<targets.length;t++){
+		for(var t=0; t<targets.length; t++){
 			
 			//initialize actual dom elements
 			actualMapObj = getMapObjIndexByName(targets[t]);
-			actualDoc = window.frames[targets[t]].document;
+			actualDoc = Mapbender.modules[targets[t]].getDomElement().ownerDocument;
 			actualImageMap = actualDoc.getElementById(this.name);
 			actualImage = actualDoc.getElementById(this.name+"_img");
 
@@ -56,8 +55,6 @@
 				actualImageMap.name = this.name;
 				actualImage.setAttribute("useMap", "#"+this.name);
 				actualImage.style.position = "absolute";
-				actualImage.style.left = "0px";
-				actualImage.style.top = "0px";
 				actualImage.style.border = "none";
 				actualDoc.body.appendChild(actualImage);
 				actualDoc.body.appendChild(actualImageMap);
@@ -67,6 +64,8 @@
 			actualImage.style.zIndex = this.zIndex;
 			actualImage.style.width = mb_mapObj[actualMapObj].width;
 			actualImage.style.height = mb_mapObj[actualMapObj].height;
+			actualImage.style.left = mb_mapObj[actualMapObj].getDomElement().style.left;
+			actualImage.style.top = mb_mapObj[actualMapObj].getDomElement().style.top;
 			
 			//generate areas
 			for(var i=0;i<gA.count();i++){
@@ -233,7 +232,7 @@
 		var actualDoc;
 		for(var i=0;i<targets.length;i++){
 			//get actual frame
-			actualDoc = window.frames[targets[i]].document;
+			actualDoc = Mapbender.modules[targets[i]].getDomElement().ownerDocument;
 			
 			//clear map
 			actualImageMap = actualDoc.getElementById(this.name);