=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2015-02-24 15:35:20 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2015-02-24 16:06:51 +0000 @@ -222,13 +222,15 @@ }; layer.registerMouseDownEvent = function() { + + // clear mousedown listeners + if (layer.events && layer.events.listeners && Ext.isArray(layer.events.listeners.mousedown)) { + layer.events.listeners.mousedown = []; + } + layer.events.register('mousedown', null, layer.onMouseDown); }; - layer.unregisterMouseDownEvent = function() { - layer.events.unregister('mousedown', null, layer.onMouseDown); - }; - defaultHoverSelect = function fn(feature) { if (isBoundary) { var style = layer.core.getDefaultFeatureStyle(); @@ -272,15 +274,13 @@ defaultHoverUnselect = function fn(feature) { defaultHoverWindow.destroy(); - - // remove mouse click event - layer.unregisterMouseDownEvent(); - - // destroy popups - //destroyDataPopups(); }; defaultLeftClickSelect = function fn(feature, e) { + if (!feature) { + return; + } + var generator = gis.init.periodGenerator, periodType = gis.init.systemSettings.infrastructuralPeriodType.name, attr = feature.attributes,