Changeset 7128 for extensions/GMaps/js/gmapsCategory.js

Timestamp:

Oct 8, 2010, 3:02:29 AM (14 years ago)

Author:

grum

Message:

Connect the plugin to the RBuilder component + fixe some small bugs

File:

• extensions/GMaps/js/gmapsCategory.js (modified) (8 diffs)

extensions/GMaps/js/gmapsCategory.js

@@ -65 +65 @@
     width:$(map.getDiv()).width(),
     height:$(map.getDiv()).height(),
-    distanceTreshold:25
+    distanceTreshold:20
   }
 
   currentMapLoad=map;
+
+  $('#gmapsLoading').css('display', 'inline-block');
+  $('#gmapsNbPhotos').html('');
+  $('#iDialogGMapWaiting').css(
+    {
+      width:$('#iGMapsIcon').width()+'px',
+      height:$('#iGMapsIcon').height()+'px',
+      top:$('#iGMapsIcon').position().top+'px',
+      left:$('#iGMapsIcon').position().left+'px',
+      display:'block'
+    }
+  );
 
   $.ajax(
@@ -80 +92 @@
         {
           tmp=$.parseJSON(msg);
-          tmp.sort(compareMarkers);
-          applyMarkers(currentMapLoad, tmp);
+          tmp.markers.sort(compareMarkers);
+          applyMarkers(currentMapLoad, tmp.markers);
+          $('#gmapsLoading').css('display', 'none');
+          $('#gmapsNbPhotos').html('['+tmp.datas.nbPhotos+']');
+          $('#iDialogGMapWaiting').css('display', 'none');
         }
     }
@@ -128 +143 @@
     var marker = new google.maps.Marker(
       {
-        position:new google.maps.LatLng(markers[i].latitude, markers[i].longitude),
+        position:new google.maps.LatLng(markers[i].lat, markers[i].lng),
         map: currentMapLoad,
-        title:markers[i].nbImagesTxt
+        title:markers[i].nbImgTxt
       }
     );
@@ -204 +219 @@
 {
   gmaps.currentInfo.displayed=index;
-  if(gmaps.currentInfo.imagesName[index]=='')
+  if(gmaps.currentInfo.imgName[index]=='')
   {
     $('#ciGMIWC_title').html(' ');
@@ -210 +225 @@
   else
   {
-    $('#ciGMIWC_title').html(gmaps.currentInfo.imagesName[index]);
-  }
-  $('#ciGMIWC_img').attr('src', gmaps.currentInfo.imagesTnFile[index]);
+    $('#ciGMIWC_title').html(gmaps.currentInfo.imgName[index]);
+  }
+  $('#ciGMIWC_img').attr('src', './galleries/'+gmaps.currentInfo.imgTn[index]);
 
   $('#ciGMIWC_img').unbind();
-  if(gmaps.currentInfo.imagesCatsUrl[index].length==1)
+  if(gmaps.currentInfo.imgCatsUrl[index].length==1)
   {
     $('#ciGMIWC_img').bind('click',
       function ()
       {
-        window.location=gmaps.currentInfo.imagesCatsUrl[gmaps.currentInfo.displayed][0];
+        window.location=gmaps.currentInfo.imgCatsUrl[gmaps.currentInfo.displayed][0];
       }
     );
@@ -227 +242 @@
   {
     $('#ciGMIWC_showcatList').html('');
-    for(var i=0;i<gmaps.currentInfo.imagesCatsUrl[index].length;i++)
+    for(var i=0;i<gmaps.currentInfo.imgCatsUrl[index].length;i++)
     {
       $('#ciGMIWC_showcatList')
-        .append('<li><a href="'+gmaps.currentInfo.imagesCatsUrl[index][i]+'">'+gmaps.currentInfo.imagesCatsNames[index][i]+'</a></li>');
+        .append('<li><a href="'+gmaps.currentInfo.imgCatsUrl[index][i]+'">'+gmaps.currentInfo.imgCatsNames[index][i]+'</a></li>');
     }
     $('#ciGMIWC_img, #ciGMIWC_showcat')
@@ -239 +254 @@
   if(gmaps.currentInfo.nbImages>1)
   {
-    $('#ciGMIWC_picnum').html((index+1)+'/'+gmaps.currentInfo.nbImagesTxt);
+    $('#ciGMIWC_picnum').html((index+1)+'/'+gmaps.currentInfo.nbImgTxt);
     $('#ciWALeft, #ciWARight').css('display', 'inline-block');
   }
   else
   {
-    $('#ciGMIWC_picnum').html(gmaps.currentInfo.nbImagesTxt);
+    $('#ciGMIWC_picnum').html(gmaps.currentInfo.nbImgTxt);
     $('#ciWALeft, #ciWARight').css('display', 'none');
   }
@@ -416 +431 @@
       }
 
+      $('div.gmapsPopup div.ui-dialog-titlebar')
+      .append('<span id="gmapsLoading" style="display:none;"><img src="./plugins/GrumPluginClasses/icons/processing.gif"><span>'+gmaps.lang.loading+'</span></span>');
+
+      $('#ui-dialog-title-iGMapsIconContent')
+      .append('<span id="gmapsNbPhotos"></span>');
+
 
     }