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

[svn_mapbender at osgeo.org]

Author: kmq
Date: 2011-01-07 02:36:42 -0800 (Fri, 07 Jan 2011)
New Revision: 7426

Modified:
   trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php
Log:
use jquery popups

Modified: trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php	2011-01-06 16:07:31 UTC (rev 7425)
+++ trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php	2011-01-07 10:36:42 UTC (rev 7426)
@@ -120,7 +120,7 @@
 var point_px = 10;
 var resultGeom = null;
 var cw_fillcolor = "#cc33cc";
-var gn = e_id_css + "_";
+var frameName = e_id_css + "_";
 var inputNotEnough = [];
 
 var button_point = "point";
@@ -130,7 +130,7 @@
 var mb_wfs_tolerance = 8;
 var activeButton = null;
 var mod_wfs_spatialRequest_geometry = null;
-var mod_wfs_spatialRequest_gn = "";
+var mod_wfs_spatialRequest_frameName = "";
 var mod_wfs_spatialRequest_epsg;
 var mod_wfs_spatialRequest_width;
 var mod_wfs_spatialRequest_height;
@@ -171,7 +171,7 @@
 		// creates a Highlight object for the request geometry
 		var styleProperties = {"position":"absolute", "top":"0px", "left":"0px", "z-index":100};
 		requestGeometryHighlight = new parent.Highlight(targetArray, "requestGeometryHighlight", styleProperties, 2);
-		parent.mb_registerSubFunctions("window.frames['" + gn +"'].requestGeometryHighlight.paint()");
+		parent.mb_registerSubFunctions("window.frames['" + frameName +"'].requestGeometryHighlight.paint()");
 	});
 
 }
@@ -318,7 +318,7 @@
 }
 
 function wfsInitFunction (j) {
-	parent.mb_regButton_frame('initWfsButton',gn,j);
+	parent.mb_regButton_frame('initWfsButton',frameName,j);
 } 
 
 function initWfsButton(ind, pos) {
@@ -328,7 +328,7 @@
 	parent.mb_button[ind].img_off = buttonWfs_imgdir + buttonWfs_src[pos];
 	parent.mb_button[ind].status = 0;
 	parent.mb_button[ind].elName = buttonWfs_id[pos];
-	parent.mb_button[ind].gn = gn;
+	parent.mb_button[ind].frameName = frameName;
 	parent.mb_button[ind].go = new Function ("requestGeometryHighlight.clean();wfsEnable(parent.mb_button["+ind+"], " + pos + ")");
 	parent.mb_button[ind].stop = new Function ("wfsDisable(parent.mb_button["+ind+"], " + pos + ")");
 	var ind = parent.getMapObjIndexByName("mapframe1");
@@ -858,10 +858,10 @@
  function makeRequest() {
 	// hide the result and detail popup
  	if (typeof(resultGeometryPopup) != "undefined") {
- 		resultGeometryPopup.hide();
+ 		resultGeometryPopup.dialog('close');
  	}
  	if (typeof(wfsPopup) != "undefined") {
- 		wfsPopup.hide();
+ 		wfsPopup.dialog('close');
  	}
 	
 	// empty the result geometry
@@ -1024,9 +1024,9 @@
 						else {
 							listOfGeom += "color:black'";
 						}
-						listOfGeom += "\t\t\t onmouseover=\"window.frames['"+gn+"'].setResult('over',"+i+")\" ";
-						listOfGeom += " onmouseout=\"window.frames['"+gn+"'].setResult('out',"+i+")\" ";
-						listOfGeom += " onclick=\"window.frames['"+gn+"'].setResult('click',"+i+"); window.frames['"+gn+"'].showWfs("+i+");\" ";
+						listOfGeom += "\t\t\t onmouseover=\"window.frames['"+frameName+"'].setResult('over',"+i+")\" ";
+						listOfGeom += " onmouseout=\"window.frames['"+frameName+"'].setResult('out',"+i+")\" ";
+						listOfGeom += " onclick=\"window.frames['"+frameName+"'].setResult('click',"+i+"); window.frames['"+frameName+"'].showWfs("+i+");\" ";
 						listOfGeom += ">"+ resultElObj[wfsConfEl] +"</td>";
 					}
 				}	
@@ -1049,14 +1049,17 @@
 	removeChildNodes(document.getElementById("progressWheel"));	
 
 	if (typeof(resultGeometryPopup) == "undefined") {
-		resultGeometryPopup = new parent.mb_popup(searchPopupTitle,contentHtml,searchPopupWidth,searchPopupHeight,searchPopupX,searchPopupY);
+		resultGeometryPopup = parent.$("<div>"+ contentHtml +"</div>").dialog({
+			title: searchPopupTitle,
+			width:searchPopupWidth,
+			height: searchPopupHeight,
+			position: [ searchPopupX,searchPopupY]
+		}); 
 	}
 	else {
-//		resultGeometryPopup.hide();
-		resultGeometryPopup.setHtml(contentHtml);
-//		resultGeometryPopup = new parent.mb_popup(searchPopupTitle,contentHtml,searchPopupWidth,searchPopupHeight,searchPopupX,searchPopupY);
+		resultGeometryPopup.html(contentHtml);
 	}
-	resultGeometryPopup.show();
+	resultGeometryPopup.dialog('open');
 } 
 
 
@@ -1086,13 +1089,17 @@
 	
 	if(details == 1){
 		if (typeof(wfsPopup) == "undefined") {
-			wfsPopup = new parent.mb_popup(detailPopupTitle,resultHtml,detailPopupWidth,detailPopupHeight,detailPopupX,detailPopupY);
+			wfsPopup = parent.$("<div>"+resultHtml+"</div>").dialog({
+				title: detailPopupTitle,
+				width: detailPopupWidth,
+				height: detailPopupWidth,
+				position: [detailPopupX,detailPopupY]
+			});
 		}
 		else {
-			wfsPopup.hide();
-			wfsPopup.setHtml(resultHtml);
+			wfsPopup.html(resultHtml);
 		}
-		wfsPopup.show();	
+		wfsPopup.dialog('open');	
 	}
 }
 //------------------------------------------------- end Editor functions