[Mapbender-commits] r5437 - branches/2.6/http/javascripts
trunk/mapbender/http/javascripts
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Jan 27 06:18:06 EST 2010
Author: verenadiewald
Date: 2010-01-27 06:18:05 -0500 (Wed, 27 Jan 2010)
New Revision: 5437
Modified:
branches/2.6/http/javascripts/mod_measure.php
trunk/mapbender/http/javascripts/mod_measure.php
Log:
removed parent. and frameName -> mapframe is div, not iframe
Modified: branches/2.6/http/javascripts/mod_measure.php
===================================================================
--- branches/2.6/http/javascripts/mod_measure.php 2010-01-27 11:12:18 UTC (rev 5436)
+++ branches/2.6/http/javascripts/mod_measure.php 2010-01-27 11:18:05 UTC (rev 5437)
@@ -65,7 +65,7 @@
el.style.position = "absolute";
el.style.top = "0px";
el.style.left = "0px";
- el.style.zIndex = "16";
+ el.style.zIndex = "98";
el.style.fontSize = "10px";
el1 = el.cloneNode(false);
@@ -114,7 +114,7 @@
el.style.cursor = 'auto';
}
var measureSub = eventAfterMeasure.trigger({}, "CAT");
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measure_sub",measureSub);
+ writeTag("",mod_measure_target+"_measure_sub",measureSub);
}
function mod_measure_disable(){
var el = mod_measure_mapObj.getDomElement();
@@ -122,8 +122,8 @@
el.onmousemove = null;
el.onmouseover = null;
el.onmouseout = null;
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measure_display","");
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measure_sub","");
+ writeTag("",mod_measure_target+"_measure_display","");
+ writeTag("",mod_measure_target+"_measure_sub","");
}
function mod_measure_timeout(){
var el = mod_measure_mapObj.getDomElement();
@@ -203,7 +203,7 @@
str_mPoints += evaluateDashes(pos1[0],pos1[1],pos0[0],pos0[1],k);
}
}
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measuring",str_mPoints);
+ writeTag("",mod_measure_target+"_measuring",str_mPoints);
}
function evaluateDashes(x1,y1,x2,y2,count){
var str_dashedLine = "";
@@ -246,11 +246,11 @@
}
if(isNaN(dist) == false && clickX > 0 && clickX < mod_measure_width && clickY > 0 && clickY < mod_measure_height){
var str_display = "<span style='font-family:"+mod_measure_font+";font-size:"+mod_measure_fontsize+";color:"+mod_measure_color2+";'>"+(Math.round(dist*100)/100)+" m</span>";
- writeTag(mod_measure_mapObj.frameName, mod_measure_target+"_measure_display",str_display);
- mb_arrangeElement(mod_measure_mapObj.frameName,mod_measure_target+"_measure_display",clickX +2, clickY - 10);
+ writeTag("", mod_measure_target+"_measure_display",str_display);
+ mb_arrangeElement("",mod_measure_target+"_measure_display",clickX +2, clickY - 10);
}
else{
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measure_display","");
+ writeTag("",mod_measure_target+"_measure_display","");
}
}
function mod_measure_close(){
@@ -288,8 +288,8 @@
mod_measure_RY = new Array();
mod_measure_Dist = new Array();
mod_measure_TotalDist = new Array();
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measuring","");
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measure_display","");
+ writeTag("",mod_measure_target+"_measuring","");
+ writeTag("",mod_measure_target+"_measure_display","");
}
var mod_closePolygon_img = new Image();
@@ -301,8 +301,8 @@
});
function mod_closePolygon(){
- var str = "<div style='position:absolute;top:25px' onmouseup='parent.mod_closePolygon_go()' ";
- str += "onmouseover='parent.mod_measure_timeout()' onmouseout='parent.mod_measure_disableTimeout()'><img src='"+mod_closePolygon_img.src+"' style='cursor:pointer' title='"+mod_closePolygon_img.title+"'></div>";
+ var str = "<div style='position:absolute;top:25px' onmouseup='mod_closePolygon_go()' ";
+ str += "onmouseover='mod_measure_timeout()' onmouseout='mod_measure_disableTimeout()'><img src='"+mod_closePolygon_img.src+"' style='cursor:pointer' title='"+mod_closePolygon_img.title+"'></div>";
return str;
}
function mod_closePolygon_go(){
@@ -317,7 +317,7 @@
});
function mod_rubber(){
- var str = "<div onmouseup='parent.mod_rubber_go()' onmouseover='parent.mod_measure_timeout()' onmouseout='parent.mod_measure_go()'><img src='"+mod_rubber_img.src+"' style='cursor:pointer' title='"+mod_rubber_img.title+"'></div>";
+ var str = "<div onmouseup='mod_rubber_go()' onmouseover='mod_measure_timeout()' onmouseout='mod_measure_go()'><img src='"+mod_rubber_img.src+"' style='cursor:pointer' title='"+mod_rubber_img.title+"'></div>";
return str;
}
function mod_rubber_go(){
@@ -332,8 +332,8 @@
});
function mod_getArea(){
- var str = "<div id='getAreaButton' style='position:absolute;top:50px' onmouseup='parent.mod_getArea_go()' ";
- str += "onmouseover='parent.mod_measure_timeout()' onmouseout='parent.mod_measure_disableTimeout()'><img src='"+mod_getArea_img.src+"' style='cursor:pointer' title='"+mod_getArea_img.title+"'></div>";
+ var str = "<div id='getAreaButton' style='position:absolute;top:50px' onmouseup='mod_getArea_go()' ";
+ str += "onmouseover='mod_measure_timeout()' onmouseout='mod_measure_disableTimeout()'><img src='"+mod_getArea_img.src+"' style='cursor:pointer' title='"+mod_getArea_img.title+"'></div>";
return str;
}
function mod_getArea_go(){
Modified: trunk/mapbender/http/javascripts/mod_measure.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_measure.php 2010-01-27 11:12:18 UTC (rev 5436)
+++ trunk/mapbender/http/javascripts/mod_measure.php 2010-01-27 11:18:05 UTC (rev 5437)
@@ -114,7 +114,7 @@
el.style.cursor = 'auto';
}
var measureSub = eventAfterMeasure.trigger({}, "CAT");
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measure_sub",measureSub);
+ writeTag("",mod_measure_target+"_measure_sub",measureSub);
}
function mod_measure_disable(){
var el = mod_measure_mapObj.getDomElement();
@@ -122,8 +122,8 @@
el.onmousemove = null;
el.onmouseover = null;
el.onmouseout = null;
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measure_display","");
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measure_sub","");
+ writeTag("",mod_measure_target+"_measure_display","");
+ writeTag("",mod_measure_target+"_measure_sub","");
}
function mod_measure_timeout(){
var el = mod_measure_mapObj.getDomElement();
@@ -203,7 +203,7 @@
str_mPoints += evaluateDashes(pos1[0],pos1[1],pos0[0],pos0[1],k);
}
}
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measuring",str_mPoints);
+ writeTag("",mod_measure_target+"_measuring",str_mPoints);
}
function evaluateDashes(x1,y1,x2,y2,count){
var str_dashedLine = "";
@@ -246,11 +246,11 @@
}
if(isNaN(dist) == false && clickX > 0 && clickX < mod_measure_width && clickY > 0 && clickY < mod_measure_height){
var str_display = "<span style='font-family:"+mod_measure_font+";font-size:"+mod_measure_fontsize+";color:"+mod_measure_color2+";'>"+(Math.round(dist*100)/100)+" m</span>";
- writeTag(mod_measure_mapObj.frameName, mod_measure_target+"_measure_display",str_display);
+ writeTag("", mod_measure_target+"_measure_display",str_display);
mb_arrangeElement("",mod_measure_target+"_measure_display",clickX +2, clickY - 10);
}
else{
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measure_display","");
+ writeTag("",mod_measure_target+"_measure_display","");
}
}
function mod_measure_close(){
@@ -288,8 +288,8 @@
mod_measure_RY = new Array();
mod_measure_Dist = new Array();
mod_measure_TotalDist = new Array();
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measuring","");
- writeTag(mod_measure_mapObj.frameName,mod_measure_target+"_measure_display","");
+ writeTag("",mod_measure_target+"_measuring","");
+ writeTag("",mod_measure_target+"_measure_display","");
}
var mod_closePolygon_img = new Image();
More information about the Mapbender_commits
mailing list