From 38cf76c23d1ac990fa9a8095006b9a684d07d99f Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
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 +++++++++----
 www/js/MonitorCtrl.js |  6 +-----
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'www')

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();
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index c14e7e65..fd0c2780 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -22,8 +22,6 @@ angular.module('zmApp.controllers')
 
             var loginData;
 
-
-
             // --------------------------------------------------------
             // Handling of back button in case modal is open should
             // close the modal
@@ -50,8 +48,6 @@ angular.module('zmApp.controllers')
             }, 1000);
 
 
-
-
             $scope.openMenu = function () {
                 $ionicSideMenuDelegate.toggleLeft();
             };
@@ -147,7 +143,7 @@ angular.module('zmApp.controllers')
                         {
                             text: $translate.instant('kButtonCancel'),
 
-                },
+                        },
                         {
                             text: $translate.instant('kButtonSave'),
                             onTap: function (e) {
-- 
cgit v1.2.3