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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-01-02 04:07:16 -0500 (Fri, 02 Jan 2009)
New Revision: 3374

Modified:
   trunk/mapbender/http/javascripts/mod_copyright.php
   trunk/mapbender/http/javascripts/mod_dependentDiv.php
   trunk/mapbender/http/javascripts/mod_dragMapSize.php
   trunk/mapbender/http/javascripts/mod_featureInfoRedirect.php
Log:
http://trac.osgeo.org/mapbender/ticket/343

Modified: trunk/mapbender/http/javascripts/mod_copyright.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_copyright.php	2009-01-02 09:05:49 UTC (rev 3373)
+++ trunk/mapbender/http/javascripts/mod_copyright.php	2009-01-02 09:07:16 UTC (rev 3374)
@@ -36,7 +36,9 @@
 var mod_copyright_font = "Arial, Helvetica, sans-serif";
 var mod_copyright_fontsize = "9px";
 
-mb_registerSubFunctions("mod_copyright()");
+eventAfterMapRequest.register(function () {
+	mod_copyright();
+});
 function mod_copyright(){
 	var ind = getMapObjIndexByName(mod_copyright_target);
 	var str_c = "<div>";
@@ -46,4 +48,4 @@
 	str_c += "<div style='font-family:"+mod_copyright_font+";font-size:"+mod_copyright_fontsize+";color:"+mod_copyright_color2+";position:absolute;top:"+(mb_mapObj[ind].height - mod_copyright_bottom)+"px;left:"+(mod_copyright_left+1)+"px'>"+mod_copyright_text+"</div>";
 	str_c += "</div>";
 	writeTag(mod_copyright_target,"copyright",str_c); 
-}
\ No newline at end of file
+}

Modified: trunk/mapbender/http/javascripts/mod_dependentDiv.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_dependentDiv.php	2009-01-02 09:05:49 UTC (rev 3373)
+++ trunk/mapbender/http/javascripts/mod_dependentDiv.php	2009-01-02 09:07:16 UTC (rev 3374)
@@ -38,11 +38,14 @@
 }
 
 
-mb_registerSubFunctions("mod_dependentDiv()");
+eventAfterMapRequest.register(function () {
+	mod_dependentDiv();
+});
+
 function mod_dependentDiv(){
 	var obj = document.getElementById(mod_dependentDiv_target).style;
 	var thisObj = document.getElementById('dependentDiv').style; 
 	thisObj.left = parseInt(obj.left) + dependentDiv_offsetLeft;
 	thisObj.top = parseInt(obj.top) + parseInt(obj.height) +  dependentDiv_offsetTop;
 	thisObj.width = parseInt(obj.width) + (2*dependentDiv_offsetTop);
-}
\ No newline at end of file
+}

Modified: trunk/mapbender/http/javascripts/mod_dragMapSize.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_dragMapSize.php	2009-01-02 09:05:49 UTC (rev 3373)
+++ trunk/mapbender/http/javascripts/mod_dragMapSize.php	2009-01-02 09:07:16 UTC (rev 3374)
@@ -22,8 +22,12 @@
 ?>
 var mod_dagMapSize_offset  = 15;
 var mod_dagMapSize_active  = false;
-mb_registerInitFunctions("mod_dragMapSize_init()");
-mb_registerSubFunctions("mod_dragMapSize_arrange()");
+eventInit.register(function () {
+	mod_dragMapSize_init();
+});
+eventAfterMapRequest.register(function () {
+	mod_dragMapSize_arrange()
+});
 
 function mod_dragMapSize_arrange(){
 	var left = parseInt(document.getElementById(mod_dragMapSize_target).style.left) + parseInt(document.getElementById(mod_dragMapSize_target).style.width) + mod_dagMapSize_offset - (parseInt(document.getElementById('dragMapSize').style.width)/2);

Modified: trunk/mapbender/http/javascripts/mod_featureInfoRedirect.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_featureInfoRedirect.php	2009-01-02 09:05:49 UTC (rev 3373)
+++ trunk/mapbender/http/javascripts/mod_featureInfoRedirect.php	2009-01-02 09:07:16 UTC (rev 3374)
@@ -22,8 +22,12 @@
 * sticky IFRAME, right from the main mapframe "mapframe1"
 */
 
-mb_registerSubFunctions("mod_featureInfoRedirect_position()");
-mb_registerFeatureInfoPreFunctions("mod_featureInfoRedirect_set(fName)");
+eventAfterMapRequest.register(function () {
+	mod_featureInfoRedirect_position();
+});
+eventBeforeFeatureInfo.register(function (obj) {
+	mod_featureInfoRedirect_set(obj.fName);
+});
 
 function mod_featureInfoRedirect_set(fName){
 	var ind = getMapObjIndexByName("mapframe1");