diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-09-26 19:54:08 -0400 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-09-26 19:54:08 -0400 |
| commit | 67900b322cf9088a4c06afe8b7e1053a6d3bb405 (patch) | |
| tree | fa51b5ba246da339003373e2345980048bf1f6f8 | |
| parent | 86ea6c8b4b005b59658a29828e007913203273bd (diff) | |
make sure touchID is not checked if usePin is off
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 4 | ||||
| -rw-r--r-- | www/js/StateCtrl.js | 5 |
3 files changed, 6 insertions, 5 deletions
@@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="com.pliablepixels.zmninja" version="0.79" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="com.pliablepixels.zmninja" version="0.80" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 853a9593..8b859a95 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -25,11 +25,11 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic $scope.pinPrompt = false; // if true, then PIN is displayed else skip - if (ZMDataModel.isLoggedIn()) { + if (ZMDataModel.isLoggedIn() ) { ZMDataModel.zmLog("User credentials are provided"); // You can login either via touch ID or typing in your code - if ( $ionicPlatform.is('ios')) + if ( $ionicPlatform.is('ios') && loginData.usePin) { $cordovaTouchID.checkSupport() .then(function () { diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js index 701f0029..a53b7911 100644 --- a/www/js/StateCtrl.js +++ b/www/js/StateCtrl.js @@ -5,8 +5,8 @@ // controller for State View angular.module('zmApp.controllers').controller('zmApp.StateCtrl', - ['$ionicPopup', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicLoading', '$ionicModal', '$state', '$http', '$rootScope','$timeout',function ( - $ionicPopup, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $ionicLoading, $ionicModal, $state, $http, $rootScope, $timeout) { + ['$ionicPopup', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicLoading', '$ionicModal', '$state', '$http', '$rootScope','$timeout',function ( + $ionicPopup, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $ionicLoading, $ionicModal, $state, $http, $rootScope, $timeout) { //---------------------------------------------------------------------- // Controller main @@ -34,6 +34,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', getRunStatus(); // Let's stagger this by 500ms each to see if Chrome lets these through + // This may also help if your Apache is not configured to let multiple connections through $timeout( function() {ZMDataModel.zmDebug("invoking LoadStatus...");getLoadStatus();},500); $timeout( function() {ZMDataModel.zmDebug("invoking DiskStatus...");getDiskStatus();},1000); |