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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-09-02 15:45:31 +0000 (Thu, 02 Sep 2010)
New Revision: 6875

Modified:
   trunk/mapbender/http/javascripts/mod_legend.php
Log:
added intval to parse top and left

Modified: trunk/mapbender/http/javascripts/mod_legend.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_legend.php	2010-09-02 09:01:06 UTC (rev 6874)
+++ trunk/mapbender/http/javascripts/mod_legend.php	2010-09-02 15:45:31 UTC (rev 6875)
@@ -53,8 +53,8 @@
 $res2 = db_prep_query($sql2, $v, $t);
 echo "<script type='text/javascript'>\n";
 echo "var mod_legend_target = '".$e_target."';\n";
-echo "var mod_legend_target_left = ".db_result($res2,0,"e_left").";\n";
-echo "var mod_legend_target_top = ".db_result($res2,0,"e_top").";\n";
+echo "var mod_legend_target_left = ".intval(db_result($res2,0,"e_left")).";\n";
+echo "var mod_legend_target_top = ".intval(db_result($res2,0,"e_top")).";\n";
 //echo "var mod_legend_target_width = ".db_result($res2,0,"e_width").";\n";
 //echo "var mod_legend_target_height = ".db_result($res2,0,"e_height").";\n";
 echo "</script>\n";
@@ -69,39 +69,6 @@
 var checkbox_on_off = typeof checkbox_on_off === "undefined" ? 'false' : checkbox_on_off;
 var stickylegend = typeof stickylegend === "undefined" ? "false" : stickylegend;
 
-// Todo: return-value may change in the next version....
-parent.eventAfterMapRequest.register(function (obj) {
-	mod_legend_pos(obj.map.elementName)
-});
-
-
-function mod_legend_init(){
-	var obj = parent.document.getElementById("legend");
-//	obj.style.top = mod_legend_target_top  + mod_legend_offsetTop;
-//	obj.style.left = mod_legend_target_left + mod_legend_target_width + mod_legend_offsetLeft; 
-	var checkobj = document.getElementById("checkboxstyle");
-	if (checkbox_on_off == 'false'){
-		checkobj.style.display = "none";
-		checkobj.style.width = 0;
-		checkobj.style.height = 0;
-	}
-	if (parent.Mapbender.events.init.done) {
-		mod_legend_pos(mod_legend_target);
-	}
-	else {
-		parent.Mapbender.events.init.register(function () {
-			mod_legend_pos(mod_legend_target);
-		});
-	}
-}
-
-function mod_legend_repaint(obj){
-	var checkobj = document.getElementById("checkboxstyle");
-	if(checkobj.style.display == "block"){
-		mod_legend_pos(mod_legend_target);     
-	}
-}
-
 function mod_legend_pos(frameName){
 	if(frameName == mod_legend_target){
 		var ind = parent.getMapObjIndexByName(mod_legend_target);
@@ -172,6 +139,39 @@
 	}
 } 
 
+// Todo: return-value may change in the next version....
+parent.eventAfterMapRequest.register(function (obj) {
+//	mod_legend_pos(obj.map.elementName)
+});
+
+
+function mod_legend_init(){
+	var obj = parent.document.getElementById("legend");
+//	obj.style.top = mod_legend_target_top  + mod_legend_offsetTop;
+//	obj.style.left = mod_legend_target_left + mod_legend_target_width + mod_legend_offsetLeft; 
+	var checkobj = document.getElementById("checkboxstyle");
+	if (checkbox_on_off == 'false'){
+		checkobj.style.display = "none";
+		checkobj.style.width = 0;
+		checkobj.style.height = 0;
+	}
+	if (parent.Mapbender.events.init.done) {
+		mod_legend_pos(mod_legend_target);
+	}
+	else {
+		parent.Mapbender.events.init.register(function () {
+			mod_legend_pos(mod_legend_target);
+		});
+	}
+}
+
+function mod_legend_repaint(obj){
+	var checkobj = document.getElementById("checkboxstyle");
+	if(checkobj.style.display == "block"){
+		mod_legend_pos(mod_legend_target);     
+	}
+}
+
 // -->
 </script>