Merge
This commit is contained in:
		
							parent
							
								
									1403ef8f99
								
							
						
					
					
						commit
						775a6e829e
					
				@ -965,7 +965,9 @@ function tripAnimationController($document, $scope, $log, $http, $timeout, $filt
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        if (trip && vm.activeTripIndex !== trip.dSIndex) vm.activeTripIndex = trip.dSIndex;
 | 
			
		||||
        vm.mainTooltip = vm.trips[vm.activeTripIndex].settings.tooltipText;
 | 
			
		||||
        if (vm.trips.length) {
 | 
			
		||||
            vm.mainTooltip = vm.trips[vm.activeTripIndex].settings.tooltipText;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    function showHidePointTooltip(text, index) {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user