diff options
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | www/js/MenuController.js | 4 | ||||
| -rwxr-xr-x | www/js/app.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json index 35c6564a..a93f036d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.3.067", + "version": "1.3.067", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -192,4 +192,4 @@ ] } } -} +}
\ No newline at end of file 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); |