summaryrefslogtreecommitdiff
path: root/www/js/DevOptionsCtrl.js
diff options
context:
space:
mode:
authorPliablePixels <pliablepixels@gmail.com>2015-06-26 11:25:06 -0400
committerPliablePixels <pliablepixels@gmail.com>2015-06-26 11:25:06 -0400
commit0e83a778b541591ef468d7ebda1493a000a545e5 (patch)
treee891381b97791d98edbbd70af4963606d494e659 /www/js/DevOptionsCtrl.js
parent9972b3e9171a400d7fc239385b3e1e8c3fd1b9bc (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/DevOptionsCtrl.js')
-rw-r--r--www/js/DevOptionsCtrl.js12
1 files changed, 12 insertions, 0 deletions
diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js
index f332bc50..374a781b 100644
--- a/www/js/DevOptionsCtrl.js
+++ b/www/js/DevOptionsCtrl.js
@@ -9,6 +9,18 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
$ionicSideMenuDelegate.toggleLeft();
};
+ //-------------------------------------------------------------------------
+ // 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 ** DevOptions Ctrl Entered");
+ ZMDataModel.setAwake(false);
+ });
+
//------------------------------------------------------------------
// Perform the login action when the user submits the login form
//------------------------------------------------------------------