summaryrefslogtreecommitdiff
path: root/www/js/EventCtrl.js
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2015-11-04 13:00:08 -0500
committerArjun Roychowdhury <pliablepixels@gmail.com>2015-11-04 13:00:08 -0500
commitdb2335113e5c6f1265d8bb103687928d55e57df6 (patch)
treef9c7bd9d71ca2fc5514bc14b5c53e97df5829b50 /www/js/EventCtrl.js
parentb721eaa84b5d2ba607daf3a1496515405d208297 (diff)
Proper android back button handling for modal views of events and monitors #61
Diffstat (limited to 'www/js/EventCtrl.js')
-rw-r--r--www/js/EventCtrl.js35
1 files changed, 35 insertions, 0 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 00bec5d3..b731d101 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -36,6 +36,38 @@ angular.module('zmApp.controllers')
var scrollbynumber = 0;
$scope.eventsBeingLoaded = true;
$scope.FrameArray = []; // will hold frame info from detailed Events API
+
+
+ // --------------------------------------------------------
+ // Handling of back button in case modal is open should
+ // close the modal
+ // --------------------------------------------------------
+
+ $ionicPlatform.registerBackButtonAction(function (e) {
+ e.preventDefault();
+ if ($scope.modal.isShown())
+ {
+ // switch off awake, as liveview is finished
+ ZMDataModel.zmDebug("Modal is open, closing it");
+ ZMDataModel.setAwake(false);
+ $scope.modal.remove();
+ }
+ else
+ {
+ ZMDataModel.zmDebug("Modal is closed, so toggling or exiting");
+ if (!$ionicSideMenuDelegate.isOpenLeft())
+ {
+ $ionicSideMenuDelegate.toggleLeft();
+
+ }
+ else
+ {
+ navigator.app.exitApp();
+ }
+
+ }
+
+ }, 1000);
document.addEventListener("pause", onPause, false);
console.log("I got STATE PARAM " + $stateParams.id);
@@ -228,6 +260,9 @@ angular.module('zmApp.controllers')
});
});
+
+
+
// not explictly handling error --> I have a default "No events found" message
// displayed in the template if events list is null