Fixes bug of indefinite loading after resetting custom timeline #360

1 files changed, 19 insertions, 8 deletions

diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js
index 4b28140d..24df1f52 100644
--- a/www/js/EventDateTimeFilterCtrl.js
+++ b/www/js/EventDateTimeFilterCtrl.js
@@ -48,14 +48,25 @@ angular.module('zmApp.controllers')
                 // you are looking at a specific monitor ID
                 // going back will only retain that monitor ID
                 // so lets reload with all monitors
-                $ionicHistory.nextViewOptions({
-                    disableBack: true
-                });
-                $state.go("events", {
-                    "id": 0,
-                    "playEvent":false
-                });
-                return;
+                // 
+                //console.log (">>> BACKVIEW="+$ionicHistory.backTitle());
+
+                if ($ionicHistory.backTitle() == 'Timeline')
+                {
+                    $ionicHistory.goBack();
+                }
+                else // in events, backview is undefined?
+                {
+                   $ionicHistory.nextViewOptions({
+                       disableBack: true
+                   });
+                   $state.go("events", {
+                       "id": 0,
+                       "playEvent":false
+                   });
+                   return;     
+                }
+               
 
                 //$ionicHistory.goBack();
             };