[mapguide-commits] r5420 - trunk/MgDev/Web/src/viewerfiles

[svn_mapguide at osgeo.org]

Author: christinebao
Date: 2010-11-30 19:03:54 -0800 (Tue, 30 Nov 2010)
New Revision: 5420

Modified:
   trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
Log:
Fix ticket http://trac.osgeo.org/mapguide/ticket/1545#
Safari 5: Session Expired message pop-up several times when Zoom in on map


Modified: trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ	2010-11-30 20:53:10 UTC (rev 5419)
+++ trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ	2010-12-01 03:03:54 UTC (rev 5420)
@@ -342,6 +342,7 @@
 var lastLegendScaleUpdate = curScale;
 var featureRequestUrl = '%s';
 %s
+var isAlertShow = false;
 
 
 // public functions -----------------------------------------------
@@ -1271,7 +1272,7 @@
 }
 
 function OnMouseUp(e)
-{
+{       
     var x = e.clientX - mapPosX;
     var y = e.clientY;
     try
@@ -1287,7 +1288,12 @@
     {
         digitizer.MouseUp(e, x, y);
         return false;
+        
     }
+    
+     if(isAlertShow)
+        return;
+        
     lastposx = x; lastposy = y;
     if(moveType == RESIZING)
     {
@@ -2052,7 +2058,7 @@
 }
 
 function RequestFailed(text)
-{
+{  
     var message = text;
     var startPos = text.indexOf("<h2>");
     if(startPos != -1)
@@ -2062,7 +2068,10 @@
         if(endPos != -1)
             message = text.substring(startPos, endPos);
     }
+    
+    isAlertShow = true;
     alert(message);
+    isAlertShow = false;
 }
 
 function DraggingShape(e)
@@ -2862,12 +2871,12 @@
 }
 
 function RequestRectSelection(x1, y1, x2, y2, append)
-{
+{    
     QueryFeatureInfo(MakeWktPolygon(x1,y1,x2,y2), append, -1, 7);
 }
 
 function RequestCircleSelection(x, y, r, append)
-{
+{  
     QueryFeatureInfo("CURVEPOLYGON ((" + (x - r) + " " + y + " (CIRCULARARCSEGMENT (" + x + " " + (y - r) + ", " + (x + r) + " " + y + "), CIRCULARARCSEGMENT (" + x + " " + (y + r) + ", " + (x - r) + " " + y + "))))", append, 0, 7);
 }
 
@@ -3110,7 +3119,7 @@
     dr.open("POST", webAgent, false);
     dr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
     dr.send(reqParams);
-
+   
     if(dr.status == 200)
     {
         var env = ParseEnvelope(dr.responseXML.documentElement);
@@ -4016,7 +4025,7 @@
     selRequest.open("POST", featureRequestUrl, false);
     selRequest.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
     selRequest.send(reqParams);
-    
+ 
     var respText = selRequest.responseText;
     if (respText && respText.length > 0)
     {