diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-11-09 11:30:40 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-11-09 11:30:40 -0500 |
| commit | f8982440e67a0b9120ae46e951e5bf105430ecfa (patch) | |
| tree | 456f359bcacb3db917085f62e8853695e93f9c5c /www/js/NVR.js | |
| parent | 22056d79213beb3c0597f2dcbad4b64d5ef40be2 (diff) | |
allow events load to be cancellable
Diffstat (limited to 'www/js/NVR.js')
| -rw-r--r-- | www/js/NVR.js | 5 |
1 files changed, 4 insertions, 1 deletions
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> " + $translate.instant('kLoadingEvents') + "...</button>"; + + //loadingStr = $translate.instant('kLoadingEvents') + "..."; } //if (loadingStr) loa |