diff --git a/src/tooltip/test/tooltip.spec.js b/src/tooltip/test/tooltip.spec.js index 11d570996d..870c67d461 100644 --- a/src/tooltip/test/tooltip.spec.js +++ b/src/tooltip/test/tooltip.spec.js @@ -998,25 +998,6 @@ describe('$uibTooltipProvider', function() { expect($body.children().length).toEqual(bodyLength); })); - it('should close on location change', inject(function($rootScope, $compile) { - elmBody = angular.element( - '
Selector Text
' - ); - - scope = $rootScope; - $compile(elmBody)(scope); - scope.$digest(); - elm = elmBody.find('span'); - elmScope = elm.scope(); - tooltipScope = elmScope.$$childTail; - - trigger(elm, 'mouseenter'); - expect(tooltipScope.isOpen).toBe(true); - - scope.$broadcast('$locationChangeSuccess'); - scope.$digest(); - expect(tooltipScope.isOpen).toBe(false); - })); }); describe('triggers', function() { diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js index 440243e924..7609d0eb72 100644 --- a/src/tooltip/tooltip.js +++ b/src/tooltip/tooltip.js @@ -540,18 +540,7 @@ angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position', 'ui.bootstrap.s } appendToBody = angular.isDefined(appendToBodyVal) ? appendToBodyVal : appendToBody; - - // if a tooltip is attached to we need to remove it on - // location change as its parent scope will probably not be destroyed - // by the change. - if (appendToBody) { - scope.$on('$locationChangeSuccess', function closeTooltipOnLocationChangeSuccess() { - if (ttScope.isOpen) { - hide(); - } - }); - } - + // Make sure tooltip is destroyed and removed. scope.$on('$destroy', function onDestroyTooltip() { unregisterTriggers();