From e8a21f8042cf417b31781939730b0d31d24e7937 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Mon, 14 Dec 2015 16:53:31 -0500 Subject: fixes Former-commit-id: 647bbb4edb32658ff4b4fd42b5ac572a1ae64139 --- www/js/EventCtrl.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'www/js/EventCtrl.js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 5102c321..b5fbf7e7 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -15,7 +15,15 @@ angular.module('zmApp.controllers') //--------------------------------------------------- // Controller main //--------------------------------------------------- - + + + $scope.mycarousel = { + index: 0 + }; + $scope.ionRange = { + index: 1 + }; + $scope.animationInProgress = false; var loginData = ZMDataModel.getLogin(); @@ -125,12 +133,7 @@ angular.module('zmApp.controllers') } */ - $scope.mycarousel = { - index: 0 - }; - $scope.ionRange = { - index: 1 - }; + // for some reason inifinite scroll is invoked -- cgit v1.2.3