From af41d034854a8d267463759a72fe1f610c9d297d Mon Sep 17 00:00:00 2001
From: Evgeny S Maksimov <admin@vragam.net>
Date: Tue, 26 Feb 2019 12:21:51 +0300
Subject: Implementation fixes

---
 web/app/view/EventsController.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'web/app/view/EventsController.js')

diff --git a/web/app/view/EventsController.js b/web/app/view/EventsController.js
index 8eb4363..9bce2bf 100644
--- a/web/app/view/EventsController.js
+++ b/web/app/view/EventsController.js
@@ -24,7 +24,11 @@ Ext.define('Traccar.view.EventsController', {
         listen: {
             controller: {
                 '*': {
-                    deselectevent: 'deselectEvent'
+                    selectdevice: 'deselectEvent',
+                    selectreport: 'deselectEvent',
+                },
+                'map': {
+                    deselectfeature: 'deselectFeature'
                 }
             },
             store: {
@@ -79,7 +83,14 @@ Ext.define('Traccar.view.EventsController', {
         Traccar.app.showEvents(false);
     },
 
-    deselectEvent: function () {
+
+    deselectEvent: function (object) {
+        if (object !== undefined) {
+            this.deselectFeature();
+        }
+    },
+
+    deselectFeature: function () {
         this.getView().getSelectionModel().deselectAll();
     },
 
-- 
cgit v1.2.3


From e3e14d53eb06240577600aa6179489e4a3a36957 Mon Sep 17 00:00:00 2001
From: Evgeny S Maksimov <admin@vragam.net>
Date: Tue, 26 Feb 2019 12:32:39 +0300
Subject: Fix comma error

---
 web/app/view/EventsController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/app/view/EventsController.js')

diff --git a/web/app/view/EventsController.js b/web/app/view/EventsController.js
index 9bce2bf..d9e0c1e 100644
--- a/web/app/view/EventsController.js
+++ b/web/app/view/EventsController.js
@@ -25,7 +25,7 @@ Ext.define('Traccar.view.EventsController', {
             controller: {
                 '*': {
                     selectdevice: 'deselectEvent',
-                    selectreport: 'deselectEvent',
+                    selectreport: 'deselectEvent'
                 },
                 'map': {
                     deselectfeature: 'deselectFeature'
-- 
cgit v1.2.3


From ff0194c227975faa5e2f1eca3007f82c5eefc620 Mon Sep 17 00:00:00 2001
From: Evgeny S Maksimov <me@vragam.net>
Date: Tue, 26 Feb 2019 21:36:43 +0300
Subject: Small improvements

---
 web/app/view/EventsController.js | 2 +-
 web/app/view/ReportController.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/app/view/EventsController.js')

diff --git a/web/app/view/EventsController.js b/web/app/view/EventsController.js
index d9e0c1e..e11b4ff 100644
--- a/web/app/view/EventsController.js
+++ b/web/app/view/EventsController.js
@@ -85,7 +85,7 @@ Ext.define('Traccar.view.EventsController', {
 
 
     deselectEvent: function (object) {
-        if (object !== undefined) {
+        if (object) {
             this.deselectFeature();
         }
     },
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 2ffca96..2f10cde 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -247,7 +247,7 @@ Ext.define('Traccar.view.ReportController', {
     },
 
     deselectReport: function (object) {
-        if (object !== undefined) {
+        if (object) {
             this.deselectFeature();
         }
     },
-- 
cgit v1.2.3