diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-07-08 17:00:15 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-07-08 17:00:15 -0400 |
| commit | 5c8c6fd3e5c80e76875f18d8009dc7769faa471b (patch) | |
| tree | 6d3411f940773510ade2f29eed96274a972fc703 /www | |
| parent | 18bec317d7b1ac7cd9794e1b2236beb864186bf4 (diff) | |
#830 bug fix
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/MenuController.js | 4 | ||||
| -rwxr-xr-x | www/js/app.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/www/js/MenuController.js b/www/js/MenuController.js index 590b927d..cb33ee10 100644 --- a/www/js/MenuController.js +++ b/www/js/MenuController.js @@ -53,10 +53,10 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io title: $translate.instant('kPassword'), scope: $scope, buttons: [ - { text: 'Cancel', + { text: $translate.instant('kButtonCancel'), type: 'button-assertive', onTap: function (e) { - $scope.loginData.isKiosk = false; + } }, { diff --git a/www/js/app.js b/www/js/app.js index 7c2aeb34..08331872 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -1117,7 +1117,7 @@ angular.module('zmApp', [ _doLogin(""); } else { - NVR.debug ('We will relogin every '+timeInterval/1000+' seconds, token supported='+ld.isTokenSupported) + NVR.debug ('We will relogin every '+timeInterval/1000+' seconds, token supported='+ld.isTokenSupported); zmAutoLoginHandle = $interval(function () { _doLogin(""); }, timeInterval); |