diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-04-22 19:19:49 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-04-22 19:19:49 -0400 |
| commit | 1b76be9de6916b91874a4c27f5ad1278f69af5c9 (patch) | |
| tree | d40f42d13a40ae9733d4c954bd8c8ebc287d04ed /www/js/TimelineCtrl.js | |
| parent | 6329db95d2d0579eb723b7ce6f2ff5a31a33da11 (diff) | |
#230 - more fixes
Former-commit-id: 74f33fe0d5bd24de568c1c9305ab3dfc2a698d94
Diffstat (limited to 'www/js/TimelineCtrl.js')
| -rw-r--r-- | www/js/TimelineCtrl.js | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index d2373fdb..383a447d 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -705,11 +705,12 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla { var visible = timeline.getVisibleItems(); ZMDataModel.zmDebug ("Visible items="+JSON.stringify(visible)); - var closestItem=""; + var closestItem=null; var minDist =99999; + var _item; for (var x = 0; x < visible.length; x++) { - var _item = timeline.itemSet.items[x]; + _item = timeline.itemSet.items[x]; if (_item.data.group == prop.group) { if (Math.abs(_item.left - prop.x) < minDist) @@ -722,8 +723,16 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla } } - ZMDataModel.zmLog ("Closest item " +closestItem.left+ " group: " + closestItem.data.group); - if (!closestItem) showEvent(closestItem.data.myevent); + + if (closestItem!=null) + { + ZMDataModel.zmLog ("Closest item " +closestItem.left+ " group: " + closestItem.data.group); + showEvent(closestItem.data.myevent); + } + else + { + ZMDataModel.zmLog ("Did not find a visible item match"); + } } else // no group row tapped, do nothing { @@ -762,11 +771,12 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla { var visible = timeline.getVisibleItems(); ZMDataModel.zmDebug ("Visible items="+JSON.stringify(visible)); - var closestItem=""; + var closestItem=null; var minDist =99999; + var _item; for (var x = 0; x < visible.length; x++) { - var _item = timeline.itemSet.items[x]; + _item = timeline.itemSet.items[x]; if (_item.data.group == prop.group) { if (Math.abs(_item.left - prop.x) < minDist) @@ -780,7 +790,15 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla } ZMDataModel.zmLog ("Closest item " +closestItem.left+ " group: " + closestItem.data.group); - if (!closestItem) eventDetails(closestItem.data.myevent); + if (closestItem!=null) + { + ZMDataModel.zmLog ("Closest item " +closestItem.left+ " group: " + closestItem.data.group); + showEvent(closestItem.data.myevent); + } + else + { + ZMDataModel.zmLog ("Did not find a visible item match"); + } } // console.log("Zoomed out too far to playback events"); |