summaryrefslogtreecommitdiff
path: root/www/js/StateCtrl.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@users.noreply.github.com>2018-10-15 10:42:02 -0400
committerGitHub <noreply@github.com>2018-10-15 10:42:02 -0400
commit7d696e85cbe7112ebc2a1b49ee957e42209a404c (patch)
treeff8135ee4b1ffeac839c8f3365d5d82e29760d77 /www/js/StateCtrl.js
parent1cd6c1ba5f1944b411f871bedeb65e93c9530bc4 (diff)
parentfb73ec7092b1763c4d64148dd8230751e10eec68 (diff)
Merge branch 'master' into master
Diffstat (limited to 'www/js/StateCtrl.js')
-rw-r--r--www/js/StateCtrl.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js
index d845d02a..62bffb81 100644
--- a/www/js/StateCtrl.js
+++ b/www/js/StateCtrl.js
@@ -63,16 +63,16 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
$scope.$on('$ionicView.enter', function () {
// console.log("**VIEW ** Montage Ctrl Entered");
NVRDataModel.setAwake(false);
-
+
});
$scope.$on('$ionicView.afterEnter', function () {
// console.log("**VIEW ** Montage Ctrl Entered");
-
- console.log ("STATE SHORTCUT: " + JSON.stringify($stateParams));
- $stateParams.shortcut && $stateParams.shortcut.fn &&
- $scope[$stateParams.shortcut.fn]($stateParams.shortcut.fnargs); // jshint ignore:line
-
+
+ console.log("STATE SHORTCUT: " + JSON.stringify($stateParams));
+ $stateParams.shortcut && $stateParams.shortcut.fn &&
+ $scope[$stateParams.shortcut.fn]($stateParams.shortcut.fnargs); // jshint ignore:line
+
});
//---------------------------------------------------------