fix(popup): popup timeout now accessible to user on $scope (#535)

resoai · Nov 22, 2020 · 6e73deb · 6e73deb
1 parent 250ac64
commit 6e73deb
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/scripts/controllers/main.js b/scripts/controllers/main.js
@@ -31,6 +31,7 @@ App.controller('Main', function ($scope, $timeout, $location, Api) {
 
    $scope.activeCamera = null;
    $scope.activePopup = null;
+   $scope.popupTimeout = null;
 
    $scope.alarmCode = null;
    $scope.activeAlarm = null;
@@ -40,7 +41,6 @@ App.controller('Main', function ($scope, $timeout, $location, Api) {
    let showedPages = [];
 
    const latestAlarmActions = {};
-   let popupTimeout = null;
    let bodyClass = null;
    const mainStyles = {};
    let activePage = null;
@@ -1396,8 +1396,9 @@ App.controller('Main', function ($scope, $timeout, $location, Api) {
    };
 
    $scope.openPopup = function (item, entity, layout) {
-      if (popupTimeout) {
-         clearTimeout(popupTimeout);
+      if ($scope.popupTimeout) {
+         clearTimeout($scope.popupTimeout);
+         $scope.popupTimeout = null;
       }
       $scope.activePopup = {
          item: item,
@@ -1407,8 +1408,9 @@ App.controller('Main', function ($scope, $timeout, $location, Api) {
    };
 
    $scope.closePopup = function () {
-      if (popupTimeout) {
-         clearTimeout(popupTimeout);
+      if ($scope.popupTimeout) {
+         clearTimeout($scope.popupTimeout);
+         $scope.popupTimeout = null;
       }
       $scope.activePopup = null;
    };
@@ -1629,7 +1631,7 @@ App.controller('Main', function ($scope, $timeout, $location, Api) {
       $scope.openPopup(item, entity, layout);
 
       if (CONFIG.doorEntryTimeout) {
-         popupTimeout = $timeout(function () {
+         $scope.popupTimeout = $timeout(function () {
             $scope.closePopup();
          }, CONFIG.doorEntryTimeout * 1000);
       }