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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-07-30 09:35:08 +0000 (Fri, 30 Jul 2010)
New Revision: 6661

Modified:
   trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php
Log:
use jQuery mouse events, not DOM

Modified: trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php	2010-07-30 09:34:33 UTC (rev 6660)
+++ trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php	2010-07-30 09:35:08 UTC (rev 6661)
@@ -21,6 +21,7 @@
 include '../include/dyn_js.php';
 //defaults for element vars
 ?>
+
 if(typeof(featureInfoLayerPopup)==='undefined')
 	var featureInfoLayerPopup = 'false';
 if(typeof(featureInfoPopupHeight)==='undefined')
@@ -55,12 +56,19 @@
 	mod_featureInfoTunnel_map = getMapObjByName(mod_featureInfoTunnel_target);
 }
 function mod_featureInfoTunnel_click(){   
-	mod_featureInfoTunnel_map.getDomElement().onclick = mod_featureInfoTunnel_event;
+	var domNode = mod_featureInfoTunnel_map.getDomElement();
+	if (domNode) {
+		$(domNode).bind("click", mod_featureInfoTunnel_event);
+	}
 	mod_featureInfoTunnel_map.getDomElement().style.cursor = "help";
 
 }
 function mod_featureInfoTunnel_disable(){
-	mod_featureInfoTunnel_map.getDomElement().onclick = null;
+	var domNode = mod_featureInfoTunnel_map.getDomElement();
+	if (domNode) {
+		$(domNode).unbind("click", mod_featureInfoTunnel_event);
+	}
+	
 	mod_featureInfoTunnel_map.getDomElement().style.cursor = "default";
 }
 
@@ -82,7 +90,7 @@
 		map_el.appendChild($div.get(0));
 	}
 
-	var point = mod_featureInfoTunnel_map.getMousePos(e);
+	var point = mod_featureInfoTunnel_map.getMousePosition(e);
 	var path = '../extensions/ext_featureInfoTunnel.php';
 	
 //TODO that code should go to featureInfo Redirect module
@@ -101,7 +109,7 @@
 			for(var i=0;i<urls.length;i++){
 				(function () {
 					var currentMapObjWidth = point.x;   
-					var currentMapObjHeight = point.y;  
+					var currentMapObjHeight = point.y;
 					$("#" + mod_featureInfoTunnel_map.elementName + "_progressWheel").html("<img src='../img/indicator_wheel.gif'/>");
 					$("#" + mod_featureInfoTunnel_map.elementName + "_progressWheel").css({
 						position: "absolute",
@@ -114,6 +122,7 @@
 					var currentRequest = urls[i];
 					var cnt = i;
 					$(".fiResultFrame").remove();
+          
 					mb_ajax_post(path, {'url':currentRequest},function(js_code,status){
 						if(js_code){
 							if(featureInfoLayerPopup == 'true') {