diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-04-22 17:03:15 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-04-22 17:03:15 -0400 |
| commit | 6329db95d2d0579eb723b7ce6f2ff5a31a33da11 (patch) | |
| tree | 318a7905d20adbe47d07f723e89c19180a503421 | |
| parent | 52d8f9af0db2f98f7955ecf8c64a0d22b434d3ef (diff) | |
#230 - make sure there is an event to display, even if group is valid (what if that group has no visibles)
Former-commit-id: 6e969f61802fcb05aba35f3cdeb3c1ca6358958c
| -rw-r--r-- | www/js/TimelineCtrl.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 4a03b28e..d2373fdb 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -705,7 +705,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla { var visible = timeline.getVisibleItems(); ZMDataModel.zmDebug ("Visible items="+JSON.stringify(visible)); - var closestItem; + var closestItem=""; var minDist =99999; for (var x = 0; x < visible.length; x++) { @@ -723,7 +723,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla } ZMDataModel.zmLog ("Closest item " +closestItem.left+ " group: " + closestItem.data.group); - showEvent(closestItem.data.myevent); + if (!closestItem) showEvent(closestItem.data.myevent); } else // no group row tapped, do nothing { @@ -762,7 +762,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla { var visible = timeline.getVisibleItems(); ZMDataModel.zmDebug ("Visible items="+JSON.stringify(visible)); - var closestItem; + var closestItem=""; var minDist =99999; for (var x = 0; x < visible.length; x++) { @@ -780,7 +780,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla } ZMDataModel.zmLog ("Closest item " +closestItem.left+ " group: " + closestItem.data.group); - eventDetails(closestItem.data.myevent); + if (!closestItem) eventDetails(closestItem.data.myevent); } // console.log("Zoomed out too far to playback events"); |