JS: simulate click on the map after popup hiding to prevent hover event mess...

1 files changed, 8 insertions, 20 deletions

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 9e35f05..e7cb384 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -517,7 +517,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
         * Display menu on the map
         */
         displayMapMenu: function(e) {
-            if (methods.hidePopup()) return;
+            if (methods.hidePopup(e)) return;
             if ($('#chimere_map_menu').is(":visible")){
                 $('#chimere_map_menu').hide();
             } else{
@@ -634,13 +634,14 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                 /*
                 * Add event listener in categories DOM elements
                 */
-                $('#categories #ul_categories > li > input').bind("click", function () {
-                    methods.hidePopup();
+                $('#categories #ul_categories > li > input').bind("click",
+                function (e) {
+                    methods.hidePopup(e);
                     _toggle_subcategories($(this));
                     methods.loadGeoObjects();
                     settings.permalink.updateLink();
                 });
-                $('.subcategories li input').bind("click", function () {
+                $('.subcategories li input').bind("click", function (e) {
                     var c_name = $(this).attr('name');
                     c_name = c_name.substr(c_name.lastIndexOf("_")+1);
                     if($(this).is(':checked')){
@@ -652,7 +653,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                     } else {
                         par.removeClass('selected');
                     }
-                    methods.hidePopup();
+                    methods.hidePopup(e);
                     methods.loadGeoObjects();
                     _toggle_categories($(this));
                     settings.permalink.updateLink();
@@ -850,10 +851,6 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                        + parseInt(marker_hover.css("margin-bottom"), 10)
                        + parseInt(marker_hover.css("borderBottomWidth"), 10)
                        + parseInt(marker_hover.css("borderTopWidth"), 10);
-                console.log(px.y);
-                console.log(map_position.top);
-                console.log(height);
-                console.log(marker.icon.size.h);
                 var pos_y = px.y + map_position.top
                             - height - marker.icon.size.h;
                 if (settings.marker_hover_offset)
@@ -1431,17 +1428,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                     }
                     if (settings.current_popup.visible()){
                         settings.current_popup.hide();
-
-
-    /*
-    var evtPx = {xy: settings.map.getPixelFromLonLat(
-     /*   settings.map.getLonLatFromViewPortPx(evt.xy))};
-    evtPx.type = 'click';*//*
-                        settings.map.events.triggerEvent('click',
-                              {xy: settings.map.minPx});*/
-                             /*   {xy: settings.map.getPixelFromLonLat(
-    settings.map.getLonLatFromViewPortPx(evt.xy))});*/
-
+                        if(evt)
+                            settings.map.events.triggerEvent('click', evt);
                         return true;
                     }
                 }