Changeset 644126

Timestamp:

12/24/2012 03:38:48 PM (13 years ago)

Author:

FranceImage

Message:

show googlemap when click on popped map

File:

• fi-geolocation/trunk/js/showme-where.js (modified) (4 diffs)

fi-geolocation/trunk/js/showme-where.js

@@ -65 +65 @@
     $j('.fi-showme-where-link').mouseover(function(event) {
         if(fi_showme_trigger == 'link_hover') {
-            $j(this).trigger('popup_map', [event]);
+            $j(this).trigger('popup_map_event', [event]);
         }
     });
@@ -73 +73 @@
         
         if(fi_showme_trigger == 'link_click') {
-            $j(this).trigger('popup_map', [event]);
+            $j(this).trigger('popup_map_event', [event]);
         }
     });
     
-    $j('.fi-showme-where-link').bind('popup_map', function(new_event, event) {
+    $j('.fi-showme-where-link').bind('popup_map_event', function(new_event, event) {
         $j('#fi-showme-where-popup').stop(true, true);
         
         allowDisappear = false;     
-        if($j('#fi-showme-where-popup').css('visibility') == 'visible') {
-            return;
-        }       
         
         var lat = $j(this).attr('coords').split(',')[0];
@@ -89 +86 @@
         var marker_latlng = new google.maps.LatLng(lat, lng);
         var zoom = parseInt($j(this).attr('coords').split(',')[2]);
+        
+        if($j('#fi-showme-where-popup').css('visibility') == 'visible') {
+            if(popup_marker.data_lat == lat && popup_marker.data_lng == lng) {
+                // don't popup map again if hovering on the link that popped up this map
+                return;
+            }
+        }       
 
         popup_map.setCenter(marker_latlng);
@@ -96 +100 @@
         }
         
-        popup_marker.setPosition(marker_latlng);    
+        popup_marker.setPosition(marker_latlng);
+        popup_marker.data_lat = lat;
+        popup_marker.data_lng = lng;
         
         // position popup