From 7a0c47e8203f300d193e2291848526f9d63c5a8e Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 15 Jul 2017 19:08:58 +1200 Subject: Fix more event selection issues --- web/app/view/map/MapMarkerController.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'web/app/view/map/MapMarkerController.js') diff --git a/web/app/view/map/MapMarkerController.js b/web/app/view/map/MapMarkerController.js index aa5be0f..951a825 100644 --- a/web/app/view/map/MapMarkerController.js +++ b/web/app/view/map/MapMarkerController.js @@ -454,7 +454,9 @@ Ext.define('Traccar.view.map.MapMarkerController', { if (this.selectedMarker) { if (this.selectedMarker.get('event')) { this.getView().getMarkersSource().removeFeature(this.selectedMarker); - this.fireEvent('deselectevent'); + if (!marker || !marker.get('event')) { + this.fireEvent('deselectevent'); + } } else if (!Ext.getStore('ReportRoute').showMarkers && this.selectedMarker.get('record') instanceof Traccar.model.Position) { this.getView().getMarkersSource().removeFeature(this.selectedMarker); @@ -495,6 +497,7 @@ Ext.define('Traccar.view.map.MapMarkerController', { }, selectEvent: function (position) { + this.fireEvent('deselectfeature'); if (position) { var maker = this.addReportMarker(position); maker.set('event', true); -- cgit v1.2.3