[Mapbender-commits] r2971 - branches/nimix_dev/http/javascripts

[svn_mapbender at osgeo.org]

Author: nimix
Date: 2008-09-18 06:33:56 -0400 (Thu, 18 Sep 2008)
New Revision: 2971

Modified:
   branches/nimix_dev/http/javascripts/mod_featureInfo.php
   branches/nimix_dev/http/javascripts/mod_featureInfoTunnel.php
Log:
put featureInfo handeling Code to the FI Modules

Modified: branches/nimix_dev/http/javascripts/mod_featureInfo.php
===================================================================
--- branches/nimix_dev/http/javascripts/mod_featureInfo.php	2008-09-18 10:08:39 UTC (rev 2970)
+++ branches/nimix_dev/http/javascripts/mod_featureInfo.php	2008-09-18 10:33:56 UTC (rev 2971)
@@ -64,6 +64,8 @@
 		clickY = e.pageY;
 	}
 	
+	eventBeforeFeatureInfo.trigger({"fName":mod_featureInfo_target});
+	
 	var ind = getMapObjIndexByName(mod_featureInfo_target);
 	var point = new Point(clickX,clickY);
 	
@@ -93,6 +95,8 @@
 					window.open(urls[i], "" , "width="+featureInfoPopupWidth+",height="+featureInfoPopupHeight+",scrollbars=yes,resizable=yes");
 			}
 		}
+		else
+			alert(unescape("Please select a layer! \n Bitte waehlen Sie eine Ebene zur Abfrage aus!"));
 	}
 	//setFeatureInfoRequest(mod_featureInfo_target,clickX,clickY);
 }
\ No newline at end of file

Modified: branches/nimix_dev/http/javascripts/mod_featureInfoTunnel.php
===================================================================
--- branches/nimix_dev/http/javascripts/mod_featureInfoTunnel.php	2008-09-18 10:08:39 UTC (rev 2970)
+++ branches/nimix_dev/http/javascripts/mod_featureInfoTunnel.php	2008-09-18 10:33:56 UTC (rev 2971)
@@ -65,7 +65,9 @@
 		clickY = e.pageY;
 	}
 
-	var ind = getMapObjIndexByName(mod_featureInfo_target);
+	eventBeforeFeatureInfo.trigger({"fName":mod_featureInfoTunnel_target});
+
+	var ind = getMapObjIndexByName(mod_featureInfoTunnel_target);
 	var point = new Point(clickX,clickY);
 	var path = '../extensions/ext_featureInfoTunnel.php';
 	
@@ -95,6 +97,8 @@
 					window.open(path+"?url="+escape(urls[i]), "" , "width="+featureInfoPopupWidth+",height="+featureInfoPopupHeight+",scrollbars=yes,resizable=yes");
 			}
 		}
+		else
+			alert(unescape("Please select a layer! \n Bitte waehlen Sie eine Ebene zur Abfrage aus!"));
 	}	
 //	setFeatureInfoRequest(mod_featureInfoTunnel_target,clickX,clickY, '../extensions/ext_featureInfoTunnel.php');
 }
\ No newline at end of file