From 38cf76c23d1ac990fa9a8095006b9a684d07d99f Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 16 Sep 2016 10:24:40 -0400 Subject: handled consoleEvents when footer is dragged up instead of tapped Former-commit-id: 5acd178850797e91ef18ce6df1e2e681817ec533 --- www/js/EventCtrl.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'www/js/EventCtrl.js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index db978454..29a7a7f0 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -69,6 +69,7 @@ angular.module('zmApp.controllers') $scope.events = []; getInitialEvents(); setupWatchers(); + footerExpand(); }); $scope.$on('$ionicView.beforeEnter', function () { @@ -745,7 +746,13 @@ angular.module('zmApp.controllers') //-------------------------------------------------------------------------- $scope.footerExpand = function () { - //https://server/zm/api/events/consoleEvents/5%20minute.json + footerExpand(); + + }; + + function footerExpand() + { + //https://server/zm/api/events/consoleEvents/5%20minute.json var ld = NVRDataModel.getLogin(); var af = "/AlarmFrames >=: " + ld.enableAlarmCount; @@ -890,9 +897,7 @@ angular.module('zmApp.controllers') } }); - - }; - + } $scope.openMenu = function () { $ionicSideMenuDelegate.toggleLeft(); -- cgit v1.2.3