Skip to content
This repository has been archived by the owner on May 29, 2019. It is now read-only.

Fix tooltip continuation #4418

Closed
wants to merge 2 commits into from
Closed

Fix tooltip continuation #4418

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3c075d
fix(tooltip): Prefer to evaluate async
Sep 11, 2015
187b015
fix(tooltip): Do not recreate tooltip
Sep 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/tooltip/tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,10 @@ angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position', 'ui.bootstrap.s
}
}

function hideTooltipBind() {
hide();
if (!$rootScope.$$phase) {
$rootScope.$digest();
}
function hideTooltipBind () {
scope.$evalAsync(function () {
hide();
});
}

// Show the tooltip popup element.
Expand Down Expand Up @@ -243,9 +242,7 @@ angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position', 'ui.bootstrap.s
isOpenExp.assign(ttScope.origScope, ttScope.isOpen);
}

if (!$rootScope.$$phase) {
ttScope.$apply(); // digest required as $apply is not called
}
ttScope.$applyAsync(); // digest required as $apply is not called

positionTooltip();
}
Expand Down Expand Up @@ -284,7 +281,7 @@ angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position', 'ui.bootstrap.s
function createTooltip() {
// There can only be one tooltip element per directive shown at once.
if (tooltip) {
removeTooltip();
return;
}
tooltipLinkedScope = ttScope.$new();
tooltip = tooltipLinker(tooltipLinkedScope, function(tooltip) {
Expand Down