diff options
| author | PliablePixels <pliablepixels@gmail.com> | 2015-06-26 11:25:06 -0400 |
|---|---|---|
| committer | PliablePixels <pliablepixels@gmail.com> | 2015-06-26 11:25:06 -0400 |
| commit | 0e83a778b541591ef468d7ebda1493a000a545e5 (patch) | |
| tree | e891381b97791d98edbbd70af4963606d494e659 /www/js/LoginCtrl.js | |
| parent | 9972b3e9171a400d7fc239385b3e1e8c3fd1b9bc (diff) | |
Added option to keep screen on when viewing footage, also cleaned up invocation of cordova plugins when in desktop - it now checks so spurious errors don't show in logs
Diffstat (limited to 'www/js/LoginCtrl.js')
| -rw-r--r-- | www/js/LoginCtrl.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index e014500b..1da2f83d 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -9,6 +9,20 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData = ZMDataModel.getLogin(); + + + //------------------------------------------------------------------------- + // Lets make sure we set screen dim properly as we enter + // The problem is we enter other states before we leave previous states + // from a callback perspective in ionic, so we really can't predictably + // reset power state on exit as if it is called after we enter another + // state, that effectively overwrites current view power management needs + //------------------------------------------------------------------------ + $scope.$on('$ionicView.enter', function () { + console.log("**VIEW ** LoginCtrl Entered"); + ZMDataModel.setAwake(false); + }); + //------------------------------------------------------------------------------- // Adds http to url if not present // http://stackoverflow.com/questions/11300906/check-if-a-string-starts-with-http-using-javascript |
