From f8982440e67a0b9120ae46e951e5bf105430ecfa Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 9 Nov 2019 11:30:40 -0500
Subject: allow events load to be cancellable

---
 www/js/NVR.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'www/js')

diff --git a/www/js/NVR.js b/www/js/NVR.js
index a103b69a..7632ba29 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -1034,6 +1034,7 @@ angular.module('zmApp.controllers')
 
 
         loginData = angular.copy(newLogin);
+       // console.log ('****** SET LOGIN:'+JSON.stringify(loginData));
         $rootScope.LoginData = loginData;
 
         serverGroupList[loginData.serverName] = angular.copy(loginData);
@@ -3429,7 +3430,9 @@ angular.module('zmApp.controllers')
           //console.log("ZMData getEvents called with ID=" + monitorId + "and Page=" + pageId);
 
           if (!loadingStr) {
-            loadingStr = $translate.instant('kLoadingEvents') + "...";
+            loadingStr="<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;  color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i>&nbsp;" + $translate.instant('kLoadingEvents') + "...</button>";
+
+            //loadingStr = $translate.instant('kLoadingEvents') + "...";
           }
           //if (loadingStr) loa
 
-- 
cgit v1.2.3