Changeset 12204 for extensions/GMaps/js/gmapsMarkup.js

Timestamp:

Sep 23, 2011, 10:44:08 PM (13 years ago)

Author:

grum

Message:

fix bugs
bug:2346 - Preview / next arrow do not work with [gmaps] tag in description
bug:2063 - Incompatibility with slideshow mode

File:

• extensions/GMaps/js/gmapsMarkup.js (modified) (23 diffs)

extensions/GMaps/js/gmapsMarkup.js

@@ -2 +2 @@
  * -----------------------------------------------------------------------------
  * file: gmapsMarkup.js
- * file version: 1.1.1
- * date: 2011-04-13
+ * file version: 1.1.2
+ * date: 2011-09-23
  */
 
-var markerImgProp = [
+
+ var gmapsCM=null,
+     gmapsMM=null;
+
+function markupMaps()
+{
+  var markerImgProp = [
       null,
       { w:32, h:32, x:15, y:31 }, // s01
@@ -14 +20 @@
     ];
 
-
-function markupMaps()
-{
   /**
    * create the map
@@ -94 +97 @@
       if(properties.fitToBounds)
       {
-        fitToBounds(map.bounds, gmapsIndex);
+        this.fitToBounds(map.bounds, gmapsIndex);
       }
       else
@@ -104 +107 @@
     if(properties.markerVisible)
     {
-      loadMarkers(map);
+      this.loadMarkers(map);
     }
     else
     {
-      initializeMapViewport(gmapsIndex);
+      this.initializeMapViewport(gmapsIndex);
     }
   };
@@ -117 +120 @@
    * @param Map map : the map
    */
-  var loadMarkers = function(map)
-  {
+  this.loadMarkers = function(map)
+  {
+    var __this=this;
+
     if(map.getBounds()==null) return(false);
     map.callId++;
@@ -150 +155 @@
             {
               tmp.markers.sort(compareMarkers);
-              applyMarkers(gmapsMarkup.maps[tmp.loadIndex].gMap, tmp.markers);
-              initializeMapViewport(tmp.loadIndex);
+              __this.applyMarkers(gmapsMarkup.maps[tmp.loadIndex].gMap, tmp.markers);
+              __this.initializeMapViewport(tmp.loadIndex);
             }
           }
@@ -166 +171 @@
    *                          latitude, longitude, nbImg
    */
-  var applyMarkers = function(map, markers)
+  this.applyMarkers = function(map, markers)
   {
     if(map==null) return(false);
@@ -178 +183 @@
       while(i<map.markers.length)
       {
-        newListIndex=markerInList(map.markers[i].uId, markers);
+        newListIndex=this.markerInList(map.markers[i].uId, markers);
         if(newListIndex==-1)
         {
@@ -197 +202 @@
     for(var i=0;i<markers.length;i++)
     {
-      var marker = new google.maps.Marker(
-        {
-          position:new google.maps.LatLng(markers[i].lat, markers[i].lng),
-          map: map,
-          title:markers[i].nbImgTxt
-        }
-      );
+      var __this=this,
+          marker = new google.maps.Marker(
+            {
+              position:new google.maps.LatLng(markers[i].lat, markers[i].lng),
+              map: map,
+              title:markers[i].nbImgTxt
+            }
+          );
 
       if(map.markerImg!=null) marker.setIcon(map.markerImg);
@@ -224 +230 @@
           function ()
           {
-            displayWindowInfo(this);
+            __this.displayWindowInfo(this);
           }
         );
@@ -257 +263 @@
   };
 
-  var markerInList=function(uniqueId, markerList)
+  this.markerInList=function(uniqueId, markerList)
   {
     for(var i=0;i<markerList.length;i++)
@@ -271 +277 @@
    * @param Marker marker : the marker
    */
-  var displayWindowInfo=function(marker)
-  {
+  this.displayWindowInfo=function(marker)
+  {
+    if(gmapsCM && gmapsCM instanceof categoryMaps) gmapsCM.closePictureInfo();
+
     gmapsMarkup.currentInfo=marker.info;
     gmapsMarkup.infoWindow.close();
     gmapsMarkup.infoWindow.setContent($('#iGMapsInfoWindowContent').clone().each(renameId).get(0));
     gmapsMarkup.infoWindow.open(marker.map, marker);
-    displayPictureInfo(gmapsMarkup.currentInfo.displayed);
+    $('#ciWALeft, #ciWARight').unbind('click');
+    $('#ciWARight').bind('click', function(event) { __this.displayPictureNext(); } );
+    $('#ciWALeft').bind('click', function(event) { __this.displayPicturePrev(); } );
+    this.displayPictureInfo(gmapsMarkup.currentInfo.displayed);
   };
   var renameId=function(i, e)
@@ -286 +297 @@
 
 
-  /**
-   *
-   */
-  var displayPictureInfo=function(index)
-  {
+  this.closePictureInfo = function ()
+  {
+    gmapsMarkup.currentInfo=null;
+    gmapsMarkup.infoWindow.setContent('');
+    gmapsMarkup.infoWindow.close();
+    $('#ciWALeft, #ciWARight').unbind('click');
+  }
+
+  /**
+   *
+   */
+  this.displayPictureInfo=function(index)
+  {
+    var __this=this;
+
+    $('#ciWALeft,#ciWARight').unbind('click');
+    $('#ciWARight').bind('click',
+      function(event)
+      {
+        __this.displayPictureNext();
+      }
+    );
+    $('#ciWALeft').bind('click',
+      function(event)
+      {
+        __this.displayPicturePrev();
+      }
+    );
+
     gmapsMarkup.currentInfo.displayed=index;
     if(gmapsMarkup.currentInfo.imgName[index]=='')
@@ -344 +379 @@
     gmapsMarkup.currentInfo.displayed--;
     if(gmapsMarkup.currentInfo.displayed<0) gmapsMarkup.currentInfo.displayed=gmapsMarkup.currentInfo.nbImg-1;
-    displayPictureInfo(gmapsMarkup.currentInfo.displayed);
+    this.displayPictureInfo(gmapsMarkup.currentInfo.displayed);
   };
 
@@ -354 +389 @@
     gmapsMarkup.currentInfo.displayed++;
     if(gmapsMarkup.currentInfo.displayed>=gmapsMarkup.currentInfo.nbImg) gmapsMarkup.currentInfo.displayed=0;
-    displayPictureInfo(gmapsMarkup.currentInfo.displayed);
+    this.displayPictureInfo(gmapsMarkup.currentInfo.displayed);
   };
 
@@ -361 +396 @@
    * check if zoomLevel
    */
-  var fitToBounds=function(bounds, mapIndex)
+  this.fitToBounds=function(bounds, mapIndex)
   {
     gmapsMarkup.maps[mapIndex].gMap.fitBounds(bounds);
@@ -372 +407 @@
   };
 
-  var initializeMapViewport=function(mapIndex)
-  {
+  this.initializeMapViewport=function(mapIndex)
+  {
+    var __this=this;
+
     if(mapIndex>-1 && !gmapsMarkup.maps[mapIndex].gMap.initialized)
     {
@@ -386 +423 @@
           function()
           {
-            loadMarkers(this);
+            __this.loadMarkers(this);
           }
         );
@@ -395 +432 @@
           function()
           {
-            loadMarkers(this);
+            __this.loadMarkers(this);
             gmapsMarkup.infoWindow.close();
           }
@@ -409 +446 @@
           function()
           {
-            fitToBounds(gmapsMarkup.maps[mapIndex].gMap.kmlFile.getDefaultViewport(), mapIndex);
+            __this.fitToBounds(gmapsMarkup.maps[mapIndex].gMap.kmlFile.getDefaultViewport(), mapIndex);
           }
         );
@@ -422 +459 @@
 
 
-$(window).load(function ()
-  {
-    var mm=new markupMaps();
+$(window).load(
+  function ()
+  {
+    gmapsMM=new markupMaps();
 
     // all maps have the same initials bounds
@@ -434 +472 @@
      'closeclick',
      function () {
-       //$('body').append($('#iGMapsInfoWindowContent'));
        gmapsMarkup.infoWindow.setContent('');
        $('#ciGMIWC_img').unbind();
@@ -465 +502 @@
               );
 
-              mm.createMap(gmapsMarkup.maps[i], i);
+              gmapsMM.createMap(gmapsMarkup.maps[i], i);
             }
           }
       }
     );
-
-
-    if($('#iGMapsInfoWindow').length==0)
-    {
-      $('body').append($('<div/>',
-                        {
-                          id:'iGMapsInfoWindow',
-                          css:{display:'none'},
-                        }
-                      ).append($('<div/>',
-                                  {
-                                    id:'iGMapsInfoWindowContent'
-                                  }
-                                ).append($('<div/>',
-                                            {
-                                              id:'iGMIWC_title',
-                                              html:'(title)'
-                                            }
-                                          )
-                                        ).append($('<table/>',
-                                                    {
-                                                      id:'iGMIWC_thumb'
-                                                    }
-                                                  ).append($('<tr/>')
-                                                            .append($('<td/>',
-                                                                      {
-                                                                        css:{width:'28px'}
-                                                                      }
-                                                                     ).append($('<div id="iWALeft" onclick="mm.displayPicturePrev();"/>')
-                                                                             )
-                                                                   )
-                                                            .append($('<td/>').append($('<img/>',
-                                                                                          {
-                                                                                            id:'iGMIWC_img',
-                                                                                            src:''
-                                                                                          }
-                                                                                        )
-                                                                                      )
-                                                                   )
-                                                            .append($('<td/>',
-                                                                      {
-                                                                        css:{width:'28px'}
-                                                                      }
-                                                                    ).append($('<div id="iWARight" onclick="mm.displayPictureNext();">')
-                                                                            )
-                                                                  )
-                                                          )
-                                                )
-                                       .append($('<div/>',
-                                                  {
-                                                    id:'iGMIWC_picnum',
-                                                    html:'0/0 photo'
-                                                  }
-                                                )
-                                              )
-                                       .append($('<div/>',
-                                                  {
-                                                    id:'iGMIWC_showcat',
-                                                    css:{display:'none'}
-                                                  }
-                                                ).append($('<span/>',
-                                                            {
-                                                              html:'gmaps_i_show_this_picture_in'
-                                                            }
-                                                          )
-                                                        )
-                                                  .append($('<ul/>',
-                                                            {
-                                                              id:'iGMIWC_showcatList'
-                                                            }
-                                                          )
-                                                        )
-                                              )
-                              )
-                    );
-    }
-
   }
 );