Compare commits

...

2 Commits

Author SHA1 Message Date
Rob Jacobs d9df83ccd6 fix(tooltip): race condition when setting position
A race condition could occur when there is an open delay that
doesn't get cancelled after the transition delay resulting in
the position logic getting called.  This will then try to set
the css of the tooltip after is has been destroyed in the
removeTooltip function.

Closes #4765
Fixes #4757
2015-10-28 13:09:35 -07:00
Foxandxss 019b0909f5 chore: add the current version of the docs
Closes #4759
2015-10-28 08:20:15 -07:00
2 changed files with 4 additions and 8 deletions
+2 -2
View File
@@ -408,10 +408,10 @@ module.exports = function(grunt) {
url: '/bootstrap/versioned-docs/' + version
};
});
jsContent[0] = {
jsContent.unshift({
version: 'Current',
url: '/bootstrap'
};
});
grunt.file.write(versionsMappingFile, JSON.stringify(jsContent));
grunt.log.writeln('File ' + versionsMappingFile.cyan + ' created.');
done();
+2 -6
View File
@@ -252,9 +252,6 @@ angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position', 'ui.bootstrap.s
// Hide the tooltip popup element.
function hide() {
cancelShow();
cancelHide();
if (!ttScope) {
return;
}
@@ -307,9 +304,10 @@ angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position', 'ui.bootstrap.s
}
function removeTooltip() {
cancelShow();
cancelHide();
unregisterObservers();
transitionTimeout = null;
if (tooltip) {
tooltip.remove();
tooltip = null;
@@ -501,8 +499,6 @@ angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position', 'ui.bootstrap.s
// Make sure tooltip is destroyed and removed.
scope.$on('$destroy', function onDestroyTooltip() {
cancelShow();
cancelHide();
unregisterTriggers();
removeTooltip();
openedTooltips.remove(ttScope);