Changeset 7308 for extensions/GMaps/templates/gmaps_dialog_area_choose.tpl

Timestamp:

Oct 20, 2010, 10:49:29 PM (14 years ago)

Author:

grum

Message:

fix bug and implement new features
bug:1926, bug:1927, bug:1929, bug:1930, bug:1931, bug:1939, bug:1946

File:

• extensions/GMaps/templates/gmaps_dialog_area_choose.tpl (modified) (9 diffs)

extensions/GMaps/templates/gmaps_dialog_area_choose.tpl

@@ -15 +15 @@
 {
   var bounds = {
-    north:0,
-    south:0,
-    east:0,
-    west:0
-  }
-  var requestId = '';
-
-  var dialogGMapsOptions = {
-      id:'',
-      eventOk:null,
-      cBuilder:null,
-      gMap:null,
-    };
+        north:0,
+        south:0,
+        east:0,
+        west:0
+      },
+      requestId = '',
+      callId=0,
+      dialogGMapsOptions = {
+        id:'',
+        eventOk:null,
+        cBuilder:null,
+        gMap:null,
+      };
 
 
@@ -194 +194 @@
    * load markers from the server
    */
-  function loadMarkers()
-  {
+  var loadMarkers = function ()
+  {
+    callId++;
+
     datas={
       requestId:requestId,
+      callId:callId,
       bounds:{
           north:bounds.north,
@@ -211 +214 @@
 
     $('#iDialogGMapNfo').html('<img src="./plugins/GrumPluginClasses/icons/processing.gif"><span>{/literal}{"gmaps_loading"|@translate}{literal}</span>');
-    $('#iDialogGMapWaiting').css(
-      {
-        width:$('#iDialogGMapsMap').width()+'px',
-        height:$('#iDialogGMapsMap').height()+'px',
-        top:(1+$('#iDialogGMapsMap').position().top)+'px',
-        left:(1+$('#iDialogGMapsMap').position().left)+'px',
-        display:'block'
-      }
-    );
 
     $.ajax(
@@ -231 +225 @@
           {
             tmp=$.parseJSON(msg);
-            tmp.markers.sort(compareMarkers);
-            applyMarkers(tmp.markers);
-            $('#iDialogGMapNfo').html(tmp.datas.nbPhotos);
-            $('#iDialogGMapWaiting').css('display', 'none');
+            if(tmp.callId==callId)
+            {
+              tmp.markers.sort(compareMarkers);
+              applyMarkers(tmp.markers);
+              $('#iDialogGMapNfo').html(tmp.datas.nbPhotos);
+            }
           }
       }
@@ -257 +253 @@
       while(i<dialogGMapsOptions.gMap.markers.length)
       {
-        newListIndex=markerInList(dialogGMapsOptions.gMap.markers[i].uniqueId, markers);
+        newListIndex=markerInList(dialogGMapsOptions.gMap.markers[i].uId, markers);
         if(newListIndex==-1)
         {
@@ -290 +286 @@
         {
           marker:marker,
-          uniqueId:markers[i].uniqueId
+          uId:markers[i].uId
         }
       );
@@ -298 +294 @@
   function compareMarkers(m1,m2)
   {
-    if(m1.uniqueId<m2.uniqueId)
+    if(m1.uId<m2.uId)
     {
       return(-1);
     }
-    else if(m1.uniqueId<m2.uniqueId)
+    else if(m1.uId<m2.uId)
     {
       return(1);
@@ -309 +305 @@
   }
 
-  function markerInList(uniqueId, markerList)
+  function markerInList(uId, markerList)
   {
     for(var i=0;i<markerList.length;i++)
     {
-      if(markerList[i].uniqueId==uniqueId) return(i)
+      if(markerList[i].uId==uId) return(i)
     }
     return(-1);
@@ -473 +469 @@
   <div id='iDialogGMapNfo'>&nbsp;</div>
   <div id='iDialogGMapsMap' style='width:95%; height:95%;margin-left:auto;margin-right:auto;border:1px solid;'></div>
-  <div id='iDialogGMapWaiting' style="display:none;"></div>
 </div>